Task: Complete current remote main merge

Identity

Take over the already-started merge of local main@4b894c7 with fetched origin/main@918f8f8 after the user's explicit authorization.
Resolve the seven remaining conflicts across AI Design source/tests and canonical project memory, preserving compatible intent from both histories.
Verify the reconciled tree and create the ordinary two-parent merge commit locally. A remote push is not part of this request.

Preserve the remote Canvas right-side Works rail, central active production plan, stable @图片N reference flow, retired Prompt Museum surface, retired Learning module, directory-only project creation, non-blocking /chat entry, and Project Configuration-owned Plugin workspace.
Preserve the local Main-normalized, operation-scoped design.assistant.progress activity projection alongside the existing single provisional assistant delta. Neither projection may become a conversation, Current Specification, authorization, or chain-of-thought surface.
Resolve semantic conflicts from base/ours/theirs and source-task evidence; do not choose a side mechanically, rewrite history, abort/reset/stash the merge, or alter unrelated user work.
Keep all adopted foreign task records byte-for-byte unchanged. In particular, leave the three pre-existing untracked task records outside this task's commit.
Retain existing external acceptance limits: no production deployment, paid Provider, signed-package, real-account, or publication success is claimed by a local merge.

Reconciled local main@4b894c7 with fetched origin/main@918f8f8; the index now has no unmerged paths and is ready for the ordinary two-parent merge commit.
Combined the remote central Canvas plan, right-side Works rail, plan history, stable reference aliases, and inline Quote flow with the local operation-scoped activity panel. Pending user message, activity, and provisional assistant reply remain one ordered group; completed activity follows its canonical user turn.
Reconciled ADR-007, architecture maps, business rules, and current state around one Current Specification authority. Removed the obsolete required-Agent entry from current state and did not restore Learning or the Prompt Museum Renderer surface.
Preserved the remote directory-only project flow, non-blocking no-Agent chat entry, Project Configuration Plugin sheet, all staged source-task history, and the three pre-existing untracked task records.
No history rewrite, remote push, package, deployment, publication, database change, paid Provider call, or historical user-data mutation was performed.

Pinned package manager: pnpm@10.33.4 confirmed through Corepack.
pnpm run typecheck — passed.
Focused Vitest across Image Canvas, Workspace Store/Route/adapter, youth plan, and reference aliases — 6 files / 90 tests passed.
pnpm run lint:check — passed with 0 errors and 5 existing warnings in src/pages/Home/index.tsx and src/pages/Makelore/index.tsx.
pnpm run build:vite — Renderer, Electron Main, Preload, and utility worker passed; only existing Browserslist, mixed-import, and chunk-size warnings were emitted.
Targeted Electron E2E across Canvas, retired Learning navigation, Code project identity/navigation, Project Configuration, and Plugin flows — 12/12 passed.
pnpm test — 225 files / 1,933 tests passed and 2 skipped; one unchanged test in pi-agent-server-process-real.test.ts failed its two-second timing assertion. The test and Pi worker/write-lease/Agent Server blobs are identical in base, both parents, and the merge index. An isolated run completed the functional path in 3.139 seconds but still exceeded the threshold; a later isolated run timed out during slow process startup. The separately skipped pressure test passed 1/1. Full-suite green is not claimed, and no unrelated threshold or Pi code was changed.
Conflict-marker scan, unmerged-path scan, and git diff --cached --check — passed.
Required project-document structure and task-aware drift/ownership checks — passed; adopted foreign task-record fingerprints remain intact.

The existing Pi real-process two-second timing test remains a separate Windows test reliability/performance follow-up; this merge provides no evidence of a Pi code regression and does not change its behavior or threshold.
Push main only if the user separately requests publication to origin.

Applied in this integration: ADR-007, module map, system overview, business rules, and current state now describe the combined central-plan/reference layout and operation-scoped transient activity contract. No further promotion is pending.