docs: record upstream merge promotion

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

@@ -6,7 +6,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
 
 - Local source snapshot `33fb31fb285b5cfb00d194a036aaf6e21cf8c5a1`,
   based on the prior local delivery `48a9189`, is integrated over fetched upstream
-  `62304dc85b3c1069cd656dfacb61ee820e216fa2` by task
+  `62304dc85b3c1069cd656dfacb61ee820e216fa2` in merge commit
+  `28897cd4a2b7179d9ccb444218a1d74a2bbc004b` by task
   `20260831-merge-upstream-main-7c3a91f2`. The integration preserves Plugin
   Marketplace Release A and AI Design Living Form V2 while adopting one long-lived
   parent Pi Agent Server with isolated per-Conversation logical Runtime, Session,

.project-docs/30-worklog/tasks/20260831-merge-upstream-main-7c3a91f2.md

@@ -8,7 +8,7 @@
 - Worktree: /Users/inmanx/Documents/makelore-merge-upstream-main-7c3a91f2
 - Base commit: 62304dc85b3c1069cd656dfacb61ee820e216fa2
 - Owner: codex
-- Status: Ready for Integration
+- Status: Completed
 
 ## Scope
 
@@ -51,8 +51,12 @@
   its source task record unchanged on source snapshot `33fb31fb`; the Integration
   Gate intentionally does not copy task-owned source records into the integration
   result.
-- Ready to commit the merge result and fast-forward the occupied local `main`;
-  no remote push is in scope.
+- Created two-parent merge commit
+  `28897cd4a2b7179d9ccb444218a1d74a2bbc004b` and fast-forwarded the occupied
+  local `main` to it. The original tracked source tree was hash-verified against
+  snapshot tree `925e515a` before moving the branch. The generated Learning player
+  remains locally present and ignored only through repository-local Git metadata;
+  no remote push was performed.
 
 ## Verification
 
@@ -67,6 +71,8 @@
 - Focused `pnpm run test:e2e` for app smoke, main navigation, Pi first chat,
   project configuration Skills and Coding project identity: 13/13 passed.
 - `git diff --check`: passed; unresolved merge path count is zero.
+- `check_project_docs.py` and task-aware `check_doc_drift.py`: passed after the
+  source task record remained on its source snapshot instead of being promoted.
 
 ## Follow-ups
 
@@ -76,6 +82,5 @@
 
 ## Promotion Candidates
 
-- The final integration merge commit on
-  `codex/20260831-merge-upstream-main-7c3a91f2-merge-upstream-main`, after the
-  project-doc drift gate passes.
+- Merge commit `28897cd4a2b7179d9ccb444218a1d74a2bbc004b` is present on local
+  `main`; no remote promotion was requested or performed.