docs: record remote main semantic conflict

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

@@ -0,0 +1,75 @@
+# Task: Integrate remote main before push
+
+## Identity
+
+- Task ID: 20260907-integrate-remote-before-push-a4c9e27b
+- Mode: Integration
+- Branch: main
+- Worktree: /Users/inmanx/Documents/makelore
+- Base commit: 6366fc28dc81a71ac60a71becfeee781fcd8890e
+- Owner: codex
+- Status: Blocked pending human decision
+
+## Scope
+
+- Reconcile local `main@6366fc2` with fetched `origin/main@da29294`, preserving
+  the local cleanup/product history and the compatible remote product work.
+- Resolve the one semantic conflict in Coding project entry/onboarding before
+  forming and pushing an ordinary two-parent merge.
+- Exclude read-only source task records from any final integration changes when
+  required by the task-document ownership boundary, while keeping them reachable
+  through the remote merge parent.
+
+## Intent And Constraints
+
+- Never force-push or rewrite either history.
+- Preserve `.makelore/project.json` authority, Electron Main/Renderer boundaries,
+  Pi `0.84.2`, the three enabled product modules, and the single light visual
+  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.
+
+## Outcome
+
+- Fetched both histories and confirmed divergence of 14 remote-only and 28
+  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
+  Browser restoration, and Token Points V2 are compatible with the local product
+  direction.
+- Found one contradictory product rule. Local source `af13aca` and its accepted
+  integration state require directory-only project creation, immediate `/chat`
+  entry, `initialized` as compatibility-only, and a non-blocking no-Agent setup
+  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.
+
+## 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.
+- 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.
+
+## 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.
+
+## 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.