merge: integrate remote main

.project-docs/30-worklog/tasks/20260903-complete-remote-merge-b41e7c92.md

@@ -0,0 +1,131 @@
+# Task: Complete remote main merge
+
+## Identity
+
+- Task ID: 20260903-complete-remote-merge-b41e7c92
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 7a37593e4be3c39a9782975de53f56a76dd53ef0
+- Owner: codex-root
+- Status: Ready for Integration
+
+## Scope
+
+- Complete the already-started normal merge of fetched `origin/main`
+  `8e947b4f0e1ff0409e52a9d528ae3bb240ceb687` into local `main`
+  `7a37593e4be3c39a9782975de53f56a76dd53ef0`.
+- Resolve all product, test, README, and canonical project-memory conflicts by
+  preserving both compatible intents: the reviewed unified `/plugins` workspace
+  and the remote Pi/runtime/Conversation fixes.
+- Run integration-focused and repository-required verification, create the merge
+  commit, and close the project-documentation gate. Do not push.
+
+## Intent And Constraints
+
+- The user explicitly authorized takeover of the dirty root worktree and completion
+  of its existing merge. The prior integration owner was released with the bundled
+  task-context recovery command; this task now exclusively owns the worktree and
+  integration lock.
+- Preserve normal two-parent history. Do not abort, rebase, reset, force-update,
+  stash, or discard staged/working content.
+- `ML-PLUGIN-NAV-001` and its R4 zero-finding acceptance are the authority for the
+  Plugin conflict: keep one canonical `/plugins` page and one sidebar entry, exact
+  replace redirects, and deletion of the three superseded page implementations.
+- Preserve remote packaged Pi runtime-root resolution, foreground Snapshot
+  reconciliation, attention-only Conversation markers, bounded missing-settlement
+  recovery, and serialized write-leased tool batches under ADR-006.
+- Keep Catalog, Account Library, official Package Store, Device Packages, project
+  enablement, Agent assignment, runtime admission, and billing as independent
+  authorities. Keep selected-model native Web Search outside the Plugin projection.
+- Preserve the three pre-existing untracked foreign task records exactly. Do not
+  package, install, deploy, publish, open a PR, or push.
+
+## Project Context Loaded
+
+- Concurrent Task Gate passed for this exact integration task, `main` worktree,
+  branch, base commit, and exclusive integration lock.
+- Planning Gate passed after reading the startup memory, active record, integrated
+  snapshot, accepted decisions, architecture/domain/evidence/reflection/commitment
+  records, all planning peer scopes, both merge histories, the Plugin implementation
+  specification, source handoffs, and final R4 acceptance.
+- All 212 peer records are readable. Twenty-nine remain registered as planning;
+  none has unresolved semantic ownership over this merge. One historical Data
+  Service scope names obsolete `.niancode` ownership, which is overridden for this
+  task by repository guidance and accepted ADR-006 rather than treated as current
+  authority.
+- The remote Project Configuration Plugin Services design is superseded by the
+  later user-confirmed unified `/plugins` specification. The remote runtime and
+  Conversation changes are compatible and must be retained.
+
+## Outcome
+
+- Took over the existing root-worktree merge only after the user explicitly
+  authorized takeover, released the stale prior owner through the bundled
+  ownership command, and acquired the exclusive integration lock for this task.
+- Resolved all 15 unmerged paths without aborting or rewriting history. The final
+  tree keeps the reviewed canonical `/plugins` page, sidebar entry, deterministic
+  legacy redirects, and source-qualified unified projection. The remote predecessor
+  Project Configuration Plugin Services component, helper, page implementations,
+  and tests remain retired rather than creating a second product surface.
+- Preserved the remote Pi runtime-root resolver, complete active-branch history,
+  foreground Snapshot reconciliation, attention-only markers, exact Token Point
+  quota projection, missing-settlement recovery, and serialized write-leased tool
+  batches. The real-process conflict now verifies both the local two-extension
+  Device Package generation and the remote post-acceptance invalid-JSON failure.
+- Reconciled README and canonical architecture/current-state/evidence/commitment
+  records semantically. The staged result is ready for a normal merge with parents
+  `7a37593e4be3c39a9782975de53f56a76dd53ef0` and
+  `8e947b4f0e1ff0409e52a9d528ae3bb240ceb687`.
+- Corrected the bundled `maintain-project-docs` recovery path so explicit
+  `--adopt-existing` records the Git-index and working-tree fingerprints of known
+  foreign task records. Unchanged adopted records now survive a merge commit,
+  while any staged or unstaged mutation is blocked again. Registered the 24
+  unchanged `MERGE_HEAD` records and three older untracked records only after the
+  user authorized this recovery.
+
+## Verification
+
+- `corepack pnpm --version` -> `10.33.4`, matching `packageManager`.
+- The initial real-process run exposed stale `node_modules` junctions into a
+  different worktree and a missing physical `@earendil-works/pi-ai`; running
+  `corepack pnpm install --frozen-lockfile --config.confirmModulesPurge=false`
+  recreated the ignored dependency tree from the unchanged lockfile.
+- `corepack pnpm run typecheck` -> passed.
+- Focused Vitest after dependency repair -> 14 files / 175 tests passed. One first
+  combined run observed a cold timing sample of 2170 ms against a 2000 ms assertion;
+  the isolated semantic regression then passed in 1.48 s, and the later full suite
+  passed the same test without changing the threshold.
+- `corepack pnpm test` -> 225 files / 1,858 passed / 2 conditional skips, followed
+  by the pressure file 1/1 passed.
+- `corepack pnpm run lint:check` -> 0 errors and the five existing warnings in
+  `src/pages/Home/index.tsx` and `src/pages/Makelore/index.tsx`.
+- `corepack pnpm run build:vite` -> Renderer, Main, Preload, and utility builds
+  passed; only existing Browserslist, mixed-import, and chunk-size warnings remain.
+- Electron E2E -> unified Plugin workspace 3/3 passed in a clean grouped rerun;
+  Coding foreground/history/badge/runtime scenarios plus project Plugin behavior
+  passed 5/5. An earlier cross-file run passed 6/8 and timed out twice waiting for
+  auth initialization; Playwright trace showed no page/network/console error, and
+  both affected tests passed when rerun as their own three-test file.
+- Repository conflict-marker search and `git diff --cached --check` -> passed.
+- Bundled skill regression -> the temporary-repository adoption test passed,
+  including unchanged pre/post-commit acceptance and staged/untracked mutation
+  rejection; both modified scripts compiled, `task_context.py doctor` reported a
+  consistent registry, and `skill-creator` validation reported `Skill is valid!`.
+- `check_doc_drift.py --task-id 20260903-complete-remote-merge-b41e7c92` ->
+  passed after exact adoption of the 27 unchanged foreign records.
+
+## Follow-ups
+
+- Do not push this merge unless the user separately requests it.
+- The three pre-existing untracked foreign task records remain byte-for-byte
+  untouched and outside this task's ownership; the local recovery baseline only
+  proves that this integration task did not change them.
+- Existing release gates remain open: exact-main installed-client Device Package
+  activation, signed/notarized macOS proof, refreshed Windows artifact proof, and
+  real selected-model Provider/Web Search acceptance are not claimed here.
+
+## Promotion Candidates
+
+- None. Accepted integration facts were applied directly to canonical project
+  memory under the exclusive Integration Gate.