From 1907924203a1a998182c8e44e8884682ef216d95 Mon Sep 17 00:00:00 2001 From: brother7 <7brother7@gmail.com> Date: Wed, 19 Aug 2026 13:08:06 +0800 Subject: [PATCH] docs(integration): record main promotion --- .project-docs/30-worklog/current-state.md | 4 +- ...20260819-integrate-design-freeze-3f8b7c.md | 54 ------------------- ...60819-promote-design-freeze-main-91c2e4.md | 43 +++++++++++++++ 3 files changed, 45 insertions(+), 56 deletions(-) delete mode 100644 .project-docs/30-worklog/tasks/20260819-integrate-design-freeze-3f8b7c.md create mode 100644 .project-docs/30-worklog/tasks/20260819-promote-design-freeze-main-91c2e4.md diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index d95ae2ce..d926a9a4 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -5,8 +5,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through - AI Design request-freeze source commit `87e4140` from feature task - `20260819-design-freeze-live-6e2c` is integrated by task - `20260819-integrate-design-freeze-3f8b7c`. Main-owned Workspace JSON + `20260819-design-freeze-live-6e2c` is integrated on `main` through `5bff5d3` + by promotion task `20260819-promote-design-freeze-main-91c2e4`. Main-owned Workspace JSON requests and shared Works token refreshes now have a complete 30-second lifecycle deadline, including response-body consumption. Timeout settles as stable `504 DESIGN_WORKSPACE_REQUEST_TIMEOUT`; low-level Electron-to-Node diff --git a/.project-docs/30-worklog/tasks/20260819-integrate-design-freeze-3f8b7c.md b/.project-docs/30-worklog/tasks/20260819-integrate-design-freeze-3f8b7c.md deleted file mode 100644 index 88f140e3..00000000 --- a/.project-docs/30-worklog/tasks/20260819-integrate-design-freeze-3f8b7c.md +++ /dev/null @@ -1,54 +0,0 @@ -# Task: Integrate AI design request freeze fix - -## Identity - -- Task ID: 20260819-integrate-design-freeze-3f8b7c -- Mode: Integration -- Branch: codex/20260819-integrate-design-freeze-3f8b7c-integrate-design-freeze -- Worktree: D:\mk-integrate-design-freeze-3f8b7c -- Base commit: 9ff79e96813ebadade0aecb8f407edf5aee0144a -- Owner: codex-root -- Status: Completed - -## Scope - -- Integrate `codex/20260819-design-freeze-live-6e2c-design-freeze-live` at `87e4140f8a7ae3da8dcbf592c8f7604f7fb2ea37` onto the current `main` baseline `9ff79e96813ebadade0aecb8f407edf5aee0144a`. -- Preserve the already-combined native password/SMS login and temporary `disable-http2` diagnostic bootstrap. -- Promote the durable AI Design request-lifecycle facts into canonical project documentation. -- Verify the integrated result before advancing `main`. - -## Intent And Constraints - -- Fix the observed renderer-wide loading state by ensuring Main-owned AI Design requests and shared token refreshes settle within a finite deadline. -- Prevent Electron network failures from implicitly replaying mutation requests through Node `fetch`; transparent fallback remains limited to safe reads. -- Preserve the existing explicit WebSocket-to-REST fallback contract and its idempotency identity. -- Treat `disable-http2` as a temporary diagnostic packaging policy, not as the confirmed root-cause fix. -- Do not modify or discard unrelated user work. The checked-out `main` worktree is clean but is still registered to a superseded packaging task, so final promotion must follow the ownership protocol. - -## Outcome - -- Source tip `87e4140f8a7ae3da8dcbf592c8f7604f7fb2ea37` merged without conflict as `471e738e77b8df46ae2ad54b9f5a241a36b0ee0f` on the isolated integration branch. -- The integrated tree contains native password/SMS login, temporary `disable-http2`, bounded AI Design requests/token refresh, and safe-read-only low-level transport fallback. -- Durable architecture, domain, evidence, current-state, commitment, and task-history records were promoted in integration mode. -- The integration branch is complete and verified. Final `main` advancement is handled as a separate promotion task after safely releasing the clean superseded-task ownership on the checked-out main worktree. - -## Verification - -- Pre-merge ancestry check: source tip contains the current `main` baseline. -- Merge conflict check — PASS; source merged through Git `ort` with no conflicts. -- Frozen dependency install — PASS with pnpm `10.33.4`, 931 packages reused from the local store. -- Focused integrated regression — PASS, 7 files / 134 tests covering login, HTTP/2 bootstrap, proxy fallback, Workspace deadlines, and shared token refresh. -- TypeScript — PASS, `pnpm run typecheck`. -- Lint — PASS with 0 errors and 7 pre-existing warnings, `pnpm run lint:check`. -- Full unit suite — PASS, 184 files / 2190 tests, `pnpm test`. -- Renderer/Main/Preload/utility production compile — PASS, `pnpm run build:vite`; existing chunk-size/dynamic-import warnings remain non-fatal. -- Whitespace validation — PASS, `git diff --check`. - -## Follow-ups - -- Run installed-client real-account Quote PATCH / retry quote / continue-adjusting smoke and verify a stalled request releases the UI within 30 seconds without blocking unrelated calls. -- Restore HTTP/2 for a controlled comparison after the finite-lifecycle fix is confirmed; keep `disable-http2` temporary until that evidence exists. - -## Promotion Candidates - -- Accepted into `20-architecture/data-flow.md`, `20-architecture/system-overview.md`, `40-domain/business-rules.md`, `30-worklog/current-state.md`, `50-evidence/evidence-index.md`, and `80-commitments/commitments.md`. diff --git a/.project-docs/30-worklog/tasks/20260819-promote-design-freeze-main-91c2e4.md b/.project-docs/30-worklog/tasks/20260819-promote-design-freeze-main-91c2e4.md new file mode 100644 index 00000000..79fd6b36 --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260819-promote-design-freeze-main-91c2e4.md @@ -0,0 +1,43 @@ +# Task: Promote AI design freeze fix to main + +## Identity + +- Task ID: 20260819-promote-design-freeze-main-91c2e4 +- Mode: Integration +- Branch: main +- Worktree: D:\Datas\OthersProjects\makelore +- Base commit: 9ff79e96813ebadade0aecb8f407edf5aee0144a +- Owner: codex-root +- Status: Completed + +## Scope + +- Fast-forward `main` from `9ff79e96813ebadade0aecb8f407edf5aee0144a` to the verified integration branch `codex/20260819-integrate-design-freeze-3f8b7c-integrate-design-freeze`. +- Record and verify the exact promoted commit without changing the already-reviewed implementation or canonical decisions. + +## Intent And Constraints + +- Preserve the complete native password/SMS login, temporary `disable-http2`, AI Design 30-second request/token-refresh deadline, and safe-read-only low-level fetch fallback. +- Perform only a fast-forward promotion; do not rewrite history or discard unrelated work. +- Keep installed-client Quote retry/confirm smoke and the permanent HTTP/2 policy as explicit follow-ups. + +## Outcome + +- `main` fast-forwarded without conflict from `9ff79e96813ebadade0aecb8f407edf5aee0144a` to verified integration commit `5bff5d3`. +- The default branch now contains native password/SMS login, temporary `disable-http2`, bounded AI Design Workspace/token-refresh requests, and no implicit mutation replay through low-level transport fallback. +- The integration task's owned record remains on its integration branch and is excluded from `main` as required by project-doc ownership boundaries; durable facts are present in canonical project memory. + +## Verification + +- Fast-forward-only merge — PASS; no conflicts or history rewrite. +- Promoted integration verification — 7 files / 134 focused tests, 184 files / 2190 full tests, typecheck, lint with 0 errors / 7 existing warnings, and Renderer/Main/Preload/utility production build all passed before promotion. +- Final branch identity, whitespace, project-doc integrity, and task-aware drift checks pending after this task record is committed. + +## Follow-ups + +- Run installed-client real-account Quote PATCH / retry quote / continue-adjusting smoke and verify a stalled request releases the UI within 30 seconds without blocking unrelated calls. +- Restore HTTP/2 for a controlled comparison after the finite-lifecycle fix is confirmed; keep `disable-http2` temporary until that evidence exists. + +## Promotion Candidates + +- None. Canonical promotion was completed in integration commit `5bff5d3` before the fast-forward.