Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.project-docs/20-architecture/module-map.md
#	src/pages/ImageCanvas/DesignConversationPane.tsx
#	tests/unit/image-canvas-page.test.tsx

.project-docs/30-worklog/tasks/20260907-complete-current-merge-b61e4a93.md

@@ -0,0 +1,91 @@
+# Task: Complete current remote main merge
+
+## Identity
+
+- Task ID: 20260907-complete-current-merge-b61e4a93
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 4b894c7e320cdf829888f63f501d176f051be7d7
+- Owner: codex-root
+- Status: Ready for Integration
+
+## Scope
+
+- 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.
+
+## Intent And Constraints
+
+- 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.
+
+## Outcome
+
+- 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.
+
+## Verification
+
+- 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.
+
+## Follow-ups
+
+- 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`.
+
+## Promotion Candidates
+
+- 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.

.project-docs/30-worklog/tasks/20260907-integrate-design-agent-activity-b7d3f1a8.md

@@ -0,0 +1,64 @@
+# Task: Integrate AI Design agent activity UI
+
+## Identity
+
+- Task ID: 20260907-integrate-design-agent-activity-b7d3f1a8
+- Mode: Integration
+- Branch: codex/20260907-integrate-design-agent-activity-b7d3f1a8-integrate-design-agent-activity
+- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260907-integrate-design-agent-activity-b7d3f1a8
+- Base commit: da29294979da4ce041edf992b590ee6ea170a44f
+- Owner: codex-root
+- Status: Ready for Integration
+
+## Scope
+
+- Integrate client source commit `81b524a02c2cf51304090afa8fb89d27c72c5d2b` from exact base `da29294979da4ce041edf992b590ee6ea170a44f`.
+- Promote the operation-scoped AI Design activity projection into canonical client memory.
+- Verify Main event normalization, Renderer reconciliation, conversation rendering, and existing Design streaming behavior.
+
+## Intent And Constraints
+
+- Render only the server's fixed public lifecycle stages beneath the matching optimistic user message.
+- Keep `design.assistant.delta` as the single provisional assistant-text stream and the right-side Living Form as the Current Specification projection.
+- Never render raw chain-of-thought, prompt/provider/tool payloads, or a duplicate global “整理进度” banner.
+- Preserve stable operation identity and existing unknown-result reconciliation.
+- Do not touch or adopt unrelated changes in the root worktree.
+
+## Outcome
+
+- Fast-forwarded the exact source commit from the recorded base without conflict.
+- Integrated Main-normalized public Design activity, operation-scoped Renderer
+  reconciliation, terminal-event convergence, and the conversation-attached activity
+  panel while preserving optimistic user messages and canonical assistant replacement.
+- Fixed two integration-review findings: a later chat no longer erases earlier
+  completed/unknown activity, and each pending operation now renders its user message,
+  activity, and provisional assistant stream as one ordered group.
+- Promoted the accepted transient-activity boundary into ADR-007, architecture maps,
+  data flow, domain rules, and current integrated state.
+- No server contract, database, billing, Quote/Task, navigation, package, deployment,
+  publication, or Provider behavior changed.
+
+## Verification
+
+- `pnpm exec vitest run tests/unit/image-workspace-store.test.ts
+  tests/unit/image-canvas-page.test.tsx
+  tests/unit/works-square-design-workspace.test.ts
+  tests/unit/image-workspace-route.test.ts` — 69 passed.
+- `pnpm exec tsc --noEmit` — passed.
+- Focused ESLint across all eight changed TypeScript/TSX files — passed.
+- `pnpm run build:vite` — passed; only existing chunk-size, dynamic-import, and
+  stale Browserslist-data warnings were emitted.
+- `git diff --check` — passed.
+- Independent integration review — PASS after the two multi-operation findings were
+  fixed and covered.
+
+## Follow-ups
+
+- Add an explicit snapshot/cursor reseed contract for a Gateway `cursor expired`
+  response in a separate transport-resilience task.
+
+## Promotion Candidates
+
+- Applied: ADR-007, system overview, module map, data flow, domain rules, and current
+  integrated state now define operation-scoped public activity as transient
+  presentation rather than Design authority or model reasoning.

.project-docs/30-worklog/tasks/20260907-land-design-agent-activity-e3b7a1c9.md

@@ -0,0 +1,63 @@
+# Task: Land AI Design agent activity UI on main
+
+## Identity
+
+- Task ID: 20260907-land-design-agent-activity-e3b7a1c9
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 7bdb42f26c60747fbabf3bb3a00e3df3477a46a3
+- Owner: codex-root
+- Status: Ready for Integration
+
+## Scope
+
+- Record and verify the root `main` landing of reviewed candidate
+  `7bdb42f26c60747fbabf3bb3a00e3df3477a46a3`.
+- Promote this root landing task as the current-state integration owner while
+  preserving the retired candidate task record as immutable evidence.
+- Preserve the three pre-existing untracked task records byte-for-byte and keep them
+  outside this task's commit.
+
+## Intent And Constraints
+
+- The candidate was fast-forwarded only after exact branch, ancestry, dirty-path, and
+  fingerprint preflight; do not rewrite its product tree.
+- Do not reset, stash, clean, stage, or edit unrelated work.
+- Reuse candidate tests and independent review; run the final root document, drift,
+  ancestry, fingerprint, and status gates that can detect landing-specific failures.
+
+## Outcome
+
+- `main` was fast-forwarded from
+  `da29294979da4ce041edf992b590ee6ea170a44f` to the exact reviewed candidate
+  `7bdb42f26c60747fbabf3bb3a00e3df3477a46a3`.
+- The landed tree contains Main-normalized public Design activity,
+  operation-scoped Renderer reconciliation, terminal convergence, and ordered
+  optimistic-user/activity/provisional-reply groups.
+- The three adopted task records retained preflight fingerprints
+  `728a9d4a20d4f0c4fee82177807c07e2a207264c`,
+  `2df2c08a55c2670f99588d3511deb1e533a6c97c`, and
+  `0538a686602b1ee7ef907880d65f5cf176b9916f`; they remain excluded from this task.
+
+## Verification
+
+- Candidate evidence: 69 focused tests, TypeScript, focused ESLint,
+  `pnpm run build:vite`, and `git diff --check` passed.
+- Independent client activity integration review: PASS after the two
+  multi-operation findings were fixed and covered.
+- Final root `check_project_docs.py`, task-aware `check_doc_drift.py`, and
+  `git diff --check` passed. `main` remained at the exact candidate, the candidate is
+  an ancestor, no non-document delta exists, and all three adopted fingerprints
+  remained unchanged.
+
+## Follow-ups
+
+- Add an explicit snapshot/cursor reseed contract for a Gateway `cursor expired`
+  response in a separate transport-resilience task.
+
+## Promotion Candidates
+
+- Applied: ADR-007, system overview, module map, data flow, domain rules, and current
+  integrated state define operation-scoped public activity as transient presentation,
+  not Design authority or model reasoning.