Merge origin/main and preserve nonblocking project entry

.project-docs/30-worklog/tasks/20260907-integrate-remote-before-push-a4c9e27b.md

@@ -8,7 +8,7 @@
 - Worktree: /Users/inmanx/Documents/makelore
 - Base commit: 6366fc28dc81a71ac60a71becfeee781fcd8890e
 - Owner: codex
-- Status: Blocked pending human decision
+- Status: Ready for integration gate
 
 ## Scope
 
@@ -28,12 +28,13 @@
   system.
 - Do not choose between contradictory product rules by timestamp, merge order,
   or an automatic `ours`/`theirs` strategy.
-- Do not modify canonical project memory or product files until the user resolves
-  the conflict.
+- The user confirmed on 2026-09-07 that the local non-blocking project-entry
+  behavior remains authoritative; reconcile all affected code, tests, and
+  canonical memory to that decision.
 
 ## Outcome
 
-- Fetched both histories and confirmed divergence of 14 remote-only and 28
+- Fetched both histories and confirmed divergence of 14 remote-only and 29
   local-only commits from their merge base.
 - Read all ten remote task records and the local project-creation source record.
   Remote official-plugin project scope, automatic game-resource delivery, Agent
@@ -45,31 +46,42 @@
   link. Remote source `8042d2b` integrated by `da29294` requires `initialized=true`
   plus a fully configured enabled Agent before Conversation entry and makes the
   first-Agent flow a required gate.
-- Integration and push remain paused at the human-decision gate; no merge or
-  product/canonical edit has been made.
+- The user confirmed directory-only creation, immediate `/chat`, non-blocking
+  no-Agent setup, and compatibility-only `initialized` as authoritative.
+- Started an ordinary `--no-commit --no-ff` merge of `origin/main@da29294`.
+  The semantic resolution rejects the remote required-Agent readiness gate and
+  retains the compatible official project-wide Plugin activation, automatic
+  Game Resource delivery, Agent Browser restoration, and Token Points V2.
+- Removed the remote-only task-record copies from the final tree without editing
+  them; they remain reachable through the remote merge parent.
 
 ## Verification
 
 - Concurrent Task Gate: passed; this worktree holds the exclusive integration
   lock and no peer owns the repository.
 - Remote fetch: passed; `origin/main` resolved to `da29294`.
-- Divergence audit: 14 remote-only / 28 local-only commits.
+- Divergence audit at merge start: 14 remote-only / 29 local-only commits.
 - Source-record semantic review: completed for all remote-only task records and
   local task `20260906-remove-project-gate-7c31`.
-- Merge, product tests, typecheck, lint, build, and push: intentionally not run
-  while the semantic decision is unresolved.
+- Conflict-marker and whitespace checks: passed after semantic resolution.
+- Typecheck: passed with the exact pinned `pnpm@10.33.4` via Corepack.
+- Focused unit tests: 346 passed and one Plugin-copy expectation failed; the
+  copy was aligned without changing behavior and its 17-test file then passed.
+- Full unit suite: 226 files / 1,912 passed / 3 skipped; the isolated pressure
+  suite passed 1/1.
+- Lint: passed with 0 errors and 5 pre-existing warnings.
+- Production Vite build: passed for Renderer, Main, Preload, and utility worker.
+- Targeted Electron E2E: 6/6 passed across first-chat/runtime behavior, Agent
+  Browser UI, project-config Skill details, and project-wide Plugin enablement.
+- Project-doc gates, merge commit, remote race check, and push remain pending.
 
 ## Follow-ups
 
-- Human confirmation is required on whether the current local non-blocking
-  project-entry behavior remains authoritative or the remote required-Agent
-  readiness gate should replace it.
-- After confirmation, merge and reconcile the chosen rule, run focused readiness
-  and onboarding tests plus repository-required typecheck/lint/build/full tests,
-  complete the project-doc integration gate, and push `main:main` normally.
+- Complete the project-doc integration gates, ordinary merge commit, remote race
+  check, and normal `main:main` push.
 
 ## Promotion Candidates
 
-- Pending integration after the conflict is resolved: promote only the chosen
-  project-entry/readiness invariant; compatible remote promotions retain their
-  verified scope and constraints.
+- Promote the confirmed non-blocking project-entry invariant together with the
+  compatible project-wide official Plugin, Game Resource delivery, Agent Browser,
+  and Token Points V2 boundaries recorded in the canonical documents.