docs: record main merge promotion

.project-docs/30-worklog/current-state.md

@@ -4,6 +4,16 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
 
 ## Integrated Through
 
+- Human-authorized takeover task `20260831-promote-main-merge-5e9c7a31` completed
+  the already-started local `main` merge as
+  `03a9e866d4366e0a1cb416e26b424fe981071310`, recorded the transfer in
+  `2ca60445d41628f1fa10e132994d2e2954b0bd4f`, and promoted verified integration
+  tip `93fba75f7493d21cffc28847ceae26fee52a00a8` through merge
+  `b928b9ac603b9797e89c1a6d8e561ad3c6eadf37`. Local `main` now contains both
+  local hosted-Plugin history and fetched `origin/main`
+  `38f85f6b5e4dc4e2c5e5b9f8f4506554cfd578f5`; the promotion merge changed only
+  canonical project memory and task records, not product code. No remote push,
+  deployment, or publication was performed.
 - Hosted Game Resource Plugin source `fe656dd865f1941f1dc2d369ce3bb09efb955fd8`
   and verification record `421c8254d51318355faec3ae94f8e1cfd4d054c5`
   from task `20260831-meowa-hosted-plugin-client-8d3a5b72` are integrated with

.project-docs/30-worklog/tasks/20260831-promote-main-merge-5e9c7a31.md

@@ -0,0 +1,94 @@
+# Task: Promote verified remote merge on main
+
+## Identity
+
+- Task ID: 20260831-promote-main-merge-5e9c7a31
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 2ca60445d41628f1fa10e132994d2e2954b0bd4f
+- Owner: codex
+- Status: Transferred to Final Integration Gate
+
+## Scope
+
+- Take over the completed feature task that occupied `main`, finish its inherited
+  `origin/main` merge without discarding staged work, and promote the already verified
+  isolated integration result onto local `main`.
+- Reconcile canonical project memory under the sole Integration Gate, preserve every
+  parent history and task record, and leave the known unrelated untracked task record
+  untouched.
+- Verify final topology, documentation ownership, and product-tree equivalence without
+  pushing, deploying, publishing, or weakening any production activation gate.
+
+## Intent And Constraints
+
+- Concurrent Task Gate: PASS. The user explicitly authorized takeover. Completed owner
+  `20260831-meowa-hosted-plugin-client-8d3a5b72` was resumed and released through the
+  documented recovery path because its worktree intentionally retained one known
+  untracked record; completed integration owner
+  `20260831-integrate-remote-main-6b3d9e1a` was released normally. This task then claimed
+  `main` with `--adopt-existing` and acquired the sole Integration lock.
+- Planning Gate: PASS after the startup set, source task records, ADR-006, architecture,
+  domain, evidence, reflection, commitments, stale-items, and peer scopes were checked.
+  All 195 peer records were readable; 32 peers were planning and 163 were ready for
+  integration. No peer owned this worktree or contradicted the verified merge intent.
+  `project-positioning.md` remains a known placeholder and does not alter this Git-only
+  promotion.
+- Preserve the remote shared Pi Agent Server/factory/runtime flags and the local rule that
+  Game Resource tools materialize only through an eligible hosted Plugin. Do not restore
+  static always-mounted tools.
+- Do not abort, reset, rebase, stash, clean, force-update Git history, or touch
+  `.project-docs/30-worklog/tasks/20260827-plugin-ml07-spec-7c5a2e91.md`.
+
+## Outcome
+
+- Verified the inherited merge inputs as local
+  `421c8254d51318355faec3ae94f8e1cfd4d054c5` plus `origin/main`
+  `38f85f6b5e4dc4e2c5e5b9f8f4506554cfd578f5`, matching verified merge
+  `372b5345dae57ce19d2630b24277596db284194c` exactly.
+- Resolved the sole `makelore-runtime.ts` conflict by retaining the remote
+  `createMakeloreRuntime(runtimeDefaults)`/runtime-flag shared Agent Server architecture,
+  local dynamic Plugin registration, and removal of static `game_asset_browser` and
+  `game_asset_review`. Completed the local merge as
+  `03a9e866d4366e0a1cb416e26b424fe981071310` and recorded feature transfer as
+  `2ca60445d41628f1fa10e132994d2e2954b0bd4f`.
+- Merged verified integration tip `93fba75f7493d21cffc28847ceae26fee52a00a8`
+  into `main` as `b928b9ac603b9797e89c1a6d8e561ad3c6eadf37`. The promotion changed only
+  canonical project memory and task records; product files were unchanged.
+- Local `main` now contains `origin/main` and the local hosted Game Resource Plugin
+  delivery. The known unrelated untracked task record remains unmodified and untracked.
+  No push, deployment, production Provider request, or publication occurred.
+- The task-aware drift gate correctly blocked this task because promotion merge
+  `b928b9a` introduced the prior integration and pull tasks' immutable records after this
+  task's recorded base. Those source records were not edited or deleted. Final ownership
+  transfers to a fresh Integration task whose base already contains them.
+
+## Verification
+
+- Unresolved merge paths: 0; conflict markers: 0; staged and unstaged
+  `git diff --check`: passed.
+- Before the inherited merge commit, its staged product/canonical tree matched verified
+  merge `372b534` except only for the isolated pull task's own record.
+- Repository-pinned `pnpm@10.33.4` `pnpm run typecheck`: passed.
+- Merge-focused Vitest suite: 12 files, 145 passed, 2 skipped.
+- Verified integration source evidence remains applicable because its product tree is
+  identical: full `pnpm test` passed 212 files / 1,721 tests with 2 skipped; lint passed
+  with 0 errors and 5 existing warnings; Renderer/Main/Preload/utility Vite build passed.
+- Pre-merge `git merge-tree` predicted no conflict when promoting the verified integration
+  branch; the predicted and actual promotion changed zero non-project-memory files.
+
+## Follow-ups
+
+- Push local `main` only when explicitly requested. This task does not publish remote
+  history.
+- Complete the final documentation gate from a fresh Integration task based on this
+  task's documentation commit; do not bypass or weaken the foreign-record boundary.
+- Keep production Marketplace installation/activation closed until the official Ed25519
+  public key, rotated server credential, positive Token Point pricing, Admission, packaged
+  install/update/rollback, uncertain-result, and real Provider acceptance gates pass.
+
+## Promotion Candidates
+
+- None. This Integration task promoted the accepted hosted Plugin facts and final local
+  `main` topology into canonical memory.