diff --git a/.project-docs/30-worklog/tasks/20260928-latest-main-merge-b6a42f90.md b/.project-docs/30-worklog/tasks/20260928-latest-main-merge-b6a42f90.md index 4386cd4a..b83f5ee7 100644 --- a/.project-docs/30-worklog/tasks/20260928-latest-main-merge-b6a42f90.md +++ b/.project-docs/30-worklog/tasks/20260928-latest-main-merge-b6a42f90.md @@ -24,7 +24,7 @@ - Adapted recovery to per-turn continuous storage, including older pages and read-only history tools; uncertain legacy index excerpts cannot leak partial answers. Display repair leaves completed turn files unchanged, including when another turn needs restart recovery. - Incomplete replies retry only on deliberate click, retaining the original problem/references and both drafts. Continuous retries require the original project/source; each newly accepted turn still resolves the current published version. Legacy pinned-version behavior remains compatible. - Persisted rejection of excessive new shortcuts so a later history repair cannot restore them; historical cards remain preserved. Removed retired discussion rendering/state updates while retaining opaque source archives. Welcome dismissal follows current account-wide scope. -- Refreshed README and combined unit/browser/native-E2E fixtures. Pending only normal main publication and remote identity confirmation; no app restart, model call, dependency change or worktree cleanup. +- Refreshed README and combined unit/browser/native-E2E fixtures. Product merge `cafebca05710b7bf1a6fa62ec51be4992a73a18c` was fast-forwarded into local main and pushed normally; `git ls-remote origin refs/heads/main`, origin/main and local main matched with a clean checkout. No app restart, model call, dependency change or worktree cleanup. ## Verification @@ -36,7 +36,7 @@ ## Follow-ups -- Confirm normal push and local/remote main identity, retaining all source and integration worktrees. +- Product publication complete; source and integration worktrees retained. - Full native Electron interaction execution and release packaging remain outside this merge validation; no claim of a rebuilt running client. ## Promotion Candidates