Merge latest main and preserve teacher upgrade safeguards

.project-docs/30-worklog/tasks/20260928-merge-reply-cleanup-eb8d39b3.md

@@ -20,21 +20,27 @@
 
 ## Outcome
 
-- Source cleanup merged locally with continuous-chat conflict resolutions; latest remote advanced during verification and is being incorporated before publication.
+- Source cleanup `40c247a` merged with the current account/Agent continuous-chat behavior in `581ebc8`, then incorporated complete remote main `077184a` before publication. Preserve its reply recovery, cloud-owned teaching policy, 0–3 new shortcuts, welcome dismissal, pagination and per-turn source/version behavior.
+- Additional merge safeguards: old component mutation route removed from the continuous API; no new per-project component state is created or imported; existing malformed legacy component archives are retained verbatim. Old component instructions cannot persist through a reused pre-upgrade cloud checkpoint: first reply-protocol turn rotates the internal thread and carries bounded public reply history, without changing the visible chat.
+- Unconfirmed legacy hint requests retain their old text, ID and original project/source. Migrated per-project drafts keep that original scope; cross-project or cross-source hint retry waits for the original scope instead of issuing another charge. Existing send-in-flight and incomplete-reply retry safeguards remain intact.
+- No package, app restart/update, cloud configuration publication, paid model call or desktop focus change. Source/live-trial and all foreign worktrees remain intact. Publication verification is recorded below after the normal push.
 
 ## Verification
 
-- Initial merge: typecheck and production Vite build passed; lint passed with 8 existing warnings. Focused backend/context/parser/browser tests 186 passed; backend overlap suites 169 passed; UI suites 127 passed and after extra regressions UI suite 61 passed; headless layout 15 passed. These overlapping runs are not an additive unique-test count.
-- Project structure checker passed. Drift checker reports the source cleanup task record as foreign because the merge imports it unchanged; no source record or canonical file was authored here.
-- Remote main moved from a21a1f0 to 077184a and already includes source 40c247a plus independently integrated reply recovery, protocol boundary and welcome fixes. Preserve that full main and add only necessary overlap safeguards before final revalidation.
+- Final `corepack pnpm run typecheck`, `corepack pnpm run lint:check` and `corepack pnpm run build:vite` passed. Lint has 8 existing unrelated warnings; build has existing chunk-size/dynamic-import warnings. No dependencies or build outputs committed.
+- Final backend focused validation: 7 suites / 261 tests passed; UI/companion/chat: 4 suites / 144 tests passed; continuous storage/retired routes: 2 suites / 17 tests passed. These runs overlap and are not an additive unique-test count.
+- Headless Chrome: all 28 teacher reply/preview layout cases verified. First run passed 27; one initial Vite scan observed an in-progress shared-type merge marker, then passed when rerun after resolution. Native Pi Electron E2E fixture parses and lists 19 tests; not launched because it opens a foreground app.
+- Full `corepack pnpm test`: 261 files / 2639 tests passed, 3 tests skipped; 3 failures in 2 unrelated Pi files. Independently reproduced exactly those same 3 failures on a disposable archive of original remote `077184a` (12 passed / 3 failed in the selected two files): two event-projector old error-message assertions and the managed-worker opener runtime-v6/v7 assertion. Baseline log: `/tmp/makelore-baseline-077184a-21n6od02/baseline-tests.log`. The script's separately gated pressure suite was then run manually and passed 1/1.
+- `git diff --check`, required project-document structure and semantic comparison against latest remote passed. Task drift checker reports 5 imported source-task documents as foreign relative to the original base; byte comparison against `077184a` confirms every imported document unchanged. Only this task's own record is authored here; no canonical writes, ownership override, baseline alteration or source-document edits were used to suppress the inherited diagnostic.
 
 ## Follow-ups
 
-- None recorded.
+- Push the verified merge normally to remote main and record exact publication identity. Packaging and installation belong to the user's colleague.
+- The 3 pre-existing Pi test assertions remain outside this teacher merge scope. Native Electron foreground interactions and signed package verification are not claimed.
 
 ## Promotion Candidates
 
-- None recorded.
+- A later canonical-memory integration should reflect current text/quick-reply-only teacher behavior and first-upgrade cloud-thread rotation. Evidence is the merged implementation, focused regressions and baseline comparison; existing cloud-defined policy and continuous-chat decisions remain unchanged. This feature task does not own the canonical integration lock.
 
 ## Project Context Loaded