合并远程主分支客户端收口

.project-docs/30-worklog/tasks/20260813-sync-push-main-9c2f71.md

@@ -94,15 +94,64 @@ Gate result:
 
 ## Outcome
 
-- Not completed.
+- `git fetch origin main --prune` resolved the authoritative remote tip to
+  `f4113a872f7cd6aee6829c9597c882846bc4085b`. The histories had diverged at
+  `253bad8b40c8cd20a25362006f5d80a4e5c4cd4a`: local `main` contained 18
+  integration/preparation commits not on the remote, while the remote contained
+  one consolidation commit not on local `main`.
+- Merged `origin/main` with `--no-ff --no-commit`, keeping local `main` as the
+  first parent. The only textual conflicts were `README.md` and
+  `.project-docs/20-architecture/data-flow.md`; both were reconciled
+  semantically instead of choosing either side wholesale.
+- Accepted the remote product consolidation that removes the independent Device
+  Preview capability and the bundled Superpowers distribution, while retaining
+  the reviewed local Updater, image-to-image, first-chat, AI-proxy, publishing,
+  and `/deliverables` behavior. Canonical architecture/current-state documents
+  were updated to remove stale live Device Preview claims and record remote tip
+  `f4113a8` under `Integrated Through`.
+- Preserved the remote startup warmup, curated course skills, per-Agent model
+  ownership, recursive Skill details, OpenCode path resolution, authentication
+  hardening, light visual consolidation, fonts, and window material changes.
+- Corrected an upstream course-skill manifest mismatch by retiring the absent
+  `deploy-publish-check` skill instead of advertising it as bundled, with a
+  regression assertion in the manager suite.
+- Corrected merge-exposed test defects without weakening production behavior:
+  project-config request mocking now receives `RequestInit`; the Windows runtime
+  queue test injects a deterministic port-owner lookup; the legacy agent-folder
+  test accepts the intentionally absent directory; and an unused test binding
+  was removed.
+- Rebased the Electron E2E contract on the consolidated UI: Code/Canvas enter
+  through the module chooser, hidden module actions are expanded before use,
+  Models is reached through the account/settings flow, Provider seeding uses the
+  Main-owned Host API, and project-backed chat mocks return valid initialized
+  configuration. Two Channels specs were removed because the remote product
+  consolidation removed their UI, route, and Host API rather than relocating
+  them. Stable test IDs were restored to the retained proxy settings controls.
+- The merge is fully verified and ready for an independent final review and
+  normal push. The final merge commit and remote equality are recorded after
+  those operations complete.
 
 ## Verification
 
-- Not run.
+- `pnpm install --frozen-lockfile` — passed.
+- High-risk focused Vitest selection — 19 files, 494/494 passed.
+- `pnpm test` — 146 files, 1574/1574 passed.
+- `pnpm run typecheck` — passed.
+- `pnpm run lint:check` — passed with 0 errors and 6 existing warnings.
+- `pnpm run build:vite` — passed.
+- `pnpm run test:electron:windows` — 3/3 passed.
+- `pnpm run test:e2e` — rebuilt Renderer/Main/Preload and passed 24/24.
+- `git diff --check` and `git diff --cached --check` — passed.
 
 ## Follow-ups
 
-- None recorded.
+- Signed packaged updater smoke and live Works Square/Bailian image-to-image
+  smoke remain external release gates; this Git synchronization does not claim
+  that either production environment has been exercised.
+- A cancelled-before-spawn OpenCode restart can still spend roughly one second
+  probing a Windows port owner. The queue regression is now deterministic; a
+  future performance change should distinguish an attached runtime before
+  skipping that lookup so attached-runtime restart behavior remains intact.
 
 ## Promotion Candidates