diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 85944a1..7e22c26 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -4,6 +4,19 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through +- Windows titlebar Logo-overlap correction source + `99a210e244731d1cdc923e9dd4adf6e09e64c2a4` from task + `20260901-windows-titlebar-logo-overlap-5100e298` is integrated onto local + `main` through product commit `e800d42595484389432fd08b11c2202074a7009e` + by task `20260902-windows-titlebar-integration-afc9e259`. The shared + `ProductTitleBar` now uses one 148 px Windows caption-control region (three + 44 px buttons plus 8 px padding on each side) both to size the control wrapper + and to inset the Makelore Logo. Canvas and Coding Electron geometry checks + confirm that the Logo ends before the minimize button; macOS keeps its zero + inset and native traffic-light behavior. Focused 11-test, full 1,788-test plus + pressure, typecheck, scoped/full lint, Vite build, and two Electron E2E checks + passed. No package, deployment, publication, backend contract, or unrelated + product layout changed. - Web Search unavailable-Release diagnostic correction source `2e093bd22c0a3c46cc08b8eede8c1bc02afd690b` from task `20260901-web-search-runtime-stale-r2-6f4a2d91` is integrated on local `main` @@ -454,4 +467,4 @@ Robot 绑定设备默认先显示“引导配网 / 已有激活码”路径选 ## Last Updated -2026-09-01 +2026-09-02 diff --git a/.project-docs/30-worklog/tasks/20260901-windows-titlebar-logo-overlap-5100e298.md b/.project-docs/30-worklog/tasks/20260901-windows-titlebar-logo-overlap-5100e298.md deleted file mode 100644 index 52b56b4..0000000 --- a/.project-docs/30-worklog/tasks/20260901-windows-titlebar-logo-overlap-5100e298.md +++ /dev/null @@ -1,51 +0,0 @@ -# Task: Fix Windows titlebar logo overlap - -## Identity - -- Task ID: 20260901-windows-titlebar-logo-overlap-5100e298 -- Mode: Feature -- Branch: codex/20260901-windows-titlebar-logo-overlap-5100e298-windows-titlebar-logo-overlap -- Worktree: D:\Datas\OthersProjects\makelore-windows-titlebar-logo-overlap-5100e298 -- Base commit: 7f0e9310a7f394249fab3cadc5c82d70f91cbfeb -- Owner: codex -- Status: Ready for integration - -## Scope - -- Reproduce and fix the Windows application-shell overlap between the Makelore logo and native minimize/maximize/close controls. -- Add focused regression coverage at the existing window/layout seam. -- Preserve existing macOS/Linux behavior and the single Makelore light visual system. - -## Intent And Constraints - -- Use the smallest platform-aware layout or window-configuration change that guarantees a non-overlapping Windows caption-control reserve. -- Do not change app identity, protocols, global user-data paths, environment variables, backend contracts, or unrelated product layout. -- Verify the exact reported symptom first; run focused tests, typecheck, relevant lint, and `pnpm run build:vite` for the final change. -- Work only in the isolated task worktree; no subagent is authorized for this repository task. - -## Outcome - -- Confirmed the exact Windows Canvas failure with a deterministic Electron E2E: the 96px Logo ended at x=1280 while the minimize button began at x=1140. -- Added a single 148px Windows control-region width (three 44px buttons plus 8px padding on each side) and use it both to size the control container and inset the Logo. macOS keeps its existing zero inset and native traffic-light behavior. -- Added a dedicated Windows Canvas titlebar E2E and updated the existing Coding titlebar geometry assertion for the platform-specific layout. -- Updated the focused TitleBar unit test to lock the Windows inset. - -## Verification - -- Red-capable reproduction before the fix, twice: `node .\node_modules\@playwright\test\cli.js test tests/e2e/windows-titlebar.spec.ts` failed consistently with `Expected <= 1140, Received 1280`. -- `pnpm exec vitest run tests/unit/title-bar.test.tsx --maxWorkers=1`: 1 file / 11 tests passed. -- `pnpm run typecheck`: passed. -- Scoped ESLint for the four touched production/test files: passed with no output. -- `pnpm run lint:check`: passed with 0 errors and 5 pre-existing warnings in untouched `src/pages/Home/index.tsx` and `src/pages/Makelore/index.tsx`. -- `pnpm test`: 214 files / 1759 tests passed, 2 skipped; pressure suite 1/1 passed. -- `pnpm run build:vite`: passed after the production change. -- `node .\node_modules\@playwright\test\cli.js test tests/e2e/windows-titlebar.spec.ts`: 1/1 passed. -- `node .\node_modules\@playwright\test\cli.js test tests/e2e/pi-coding-first-chat.spec.ts --grep 'PI feature UI isolates Conversations'`: 1/1 passed. - -## Follow-ups - -- None. - -## Promotion Candidates - -- None. This is a local Renderer layout correction and does not change canonical architecture, domain rules, or product direction. diff --git a/.project-docs/30-worklog/tasks/20260902-windows-titlebar-integration-afc9e259.md b/.project-docs/30-worklog/tasks/20260902-windows-titlebar-integration-afc9e259.md new file mode 100644 index 0000000..ec8f18a --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260902-windows-titlebar-integration-afc9e259.md @@ -0,0 +1,63 @@ +# Task: Integrate Windows titlebar logo fix + +## Identity + +- Task ID: 20260902-windows-titlebar-integration-afc9e259 +- Mode: Integration +- Branch: main +- Worktree: D:\Datas\OthersProjects\makelore +- Base commit: d83757a115b12a68ea69d5acfb4a0e8b5783216c +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Integrate source commit `99a210e` from task `20260901-windows-titlebar-logo-overlap-5100e298` onto local `main`. +- Re-run proportionate verification against the current integrated tree. +- Record the integration in canonical current state without promoting new architecture, domain, or product-direction claims. + +## Intent And Constraints + +- Preserve the source change exactly unless the current `main` requires an explicit, reviewed conflict resolution. +- Keep the fix limited to Windows titlebar control spacing and its focused regression coverage; macOS/Linux behavior remains unchanged. +- Do not push, deploy, package, publish, or alter application identity, protocols, backend contracts, or unrelated layout. +- Preserve the pre-existing untracked package task records `20260901-package-122-c5e8.md` and `20260901-package-123-d7f3.md` byte-for-byte and exclude them from all commits. +- Treat the source task record and its supporting evidence as read-only integration inputs. + +## Project Context Loaded + +- Project goal: preserve Makelore's four-module cross-platform Electron product and single light visual system. +- Current integrated focus: local `main` already contains the latest Web Search correction; this task is an independent Renderer-shell integration. +- Active task scope: integrate one completed Windows titlebar spacing correction, verify it on the current default branch, and record the exact integration frontier. +- Active constraints: no macOS/Linux behavior change, no unrelated layout or contract change, and no push, deployment, packaging, or publication. +- Decisions affecting this task: no accepted ADR or product-direction change is required; the Renderer/Main ownership boundary remains unchanged. +- Evidence, reflections, or commitments: the source task contains a deterministic pre-fix Electron reproduction and complete local verification; no reflection or future commitment is introduced. +- Files involved: shared TitleBar component, focused unit/Electron tests, source task record, this integration record, and canonical current state. +- Other active local tasks: all 207 peer task records were readable; only the completed source task shares titlebar semantics. +- Unknowns or conflicts: `project-positioning.md` remains a template placeholder, but AGENTS guidance, system overview, and current state provide the applicable product boundary. No unresolved semantic conflict exists. +- Gate result: Passed. + +## Outcome + +- Cherry-picked source commit `99a210e244731d1cdc923e9dd4adf6e09e64c2a4` without conflict as product commit `e800d42595484389432fd08b11c2202074a7009e` on local `main`. +- The shared Windows TitleBar now reserves the same 148 px region for both the custom controls and the Logo inset, eliminating the Canvas and Coding overlap while retaining the existing macOS/Linux behavior. +- Canonical current state records the exact source and product commits; no architecture, ADR, domain rule, backend contract, application identity, package, deployment, or publication changed. +- The two pre-existing untracked package task records remain outside this task and outside all commits. + +## Verification + +- Source evidence adopted: deterministic pre-fix Electron reproduction; focused 11/11; 214 files / 1,759 tests plus pressure; typecheck; scoped/full lint; Vite build; and two focused Electron E2E checks passed. +- Post-integration focused unit: `tests/unit/title-bar.test.tsx` passed 11/11. +- Post-integration `pnpm run typecheck` and scoped ESLint passed. +- Post-integration `pnpm run build:vite` passed; existing Browserslist, mixed dynamic/static import, and chunk-size warnings remain non-blocking. +- Post-integration Windows Canvas and Coding Electron titlebar E2E checks passed 1/1 each. +- Post-integration `pnpm run lint:check` passed with 0 errors and the same 5 pre-existing warnings in untouched Home and Makelore pages. +- Post-integration `pnpm test` passed 215 files / 1,788 tests with 2 skipped; pressure suite passed 1/1. + +## Follow-ups + +- None. + +## Promotion Candidates + +- None. This integration records a local Renderer layout correction and does not alter canonical architecture, domain rules, or product direction.