[henrychu04]

Stage 4 of the e923627 → 67661cf upstream sync: pingdotgg#26238 on its own, upstream's deletion of about 18k lines that nothing reaches. With this stage, coder-only is synced through upstream 67661cf.

Taken: upstream's deletions everywhere, including the RPCs it removed: WsServerGetSettingsRpc, WsTerminalRestartRpc, WsSubscribeTerminalEventsRpc, WsOrchestrationV2SubscribeArchivedShellRpc and WsScheduledTasksListRpc. They also leave CoderWsRpcGroup; nothing in the gateway, helper or coder-cli used them. Fork seams stay wherever their code survives. Two markers went with blocks upstream deleted: the trimmed-config note in CodexAdapterV2.testkit.ts, and the scheduledTasksList webhook note in ws.ts.

Fork code the deletions would have broken (each a Coder: seam, listed in the seams doc):

• shared's resolveProjectAutoPull moves into the fork-only vcs/projectAutoPull.ts, which the legacy project.autoPull support still uses.
• client-runtime state/runtime.ts keeps exporting executeAtomCommand for the fork-only diagnostics test.
• acp-mock-agent.ts keeps T3_ACP_COMMAND_ADVERTISEMENT_DELAY_MS for the Kilo Code adapter test.
• TimelineV2EventRow returns null for link_request items, since upstream's generic fallback is gone.
• The ungated provider settings move under upstream's RemoteSessionGatedProviderSettings name.
• Four fork-only tests are adapted to the removed APIs: the GitWorkflowService jj guard, readEnvironmentServerConfigLoaded, and the MR surface host.

Also:

• apps/server drops the @opencode-ai/sdk that the merge reintroduced, and takes upstream's removal of @modelcontextprotocol/sdk.
• The new source-control-core pullRequestUtils.ts is carried for the GitLab driver.
• knip ignores that file's cut-host exports and shared fileLinks' desktop-only joinPath.
• The seams doc drops a stale "replay fixtures kept on purpose" sentence.

Verification:

• Static checks: every AGENTS.md typecheck, pnpm knip:check, the unused-locals check (empty), vp fmt --check, and the section 6 marker and lost-line checks pass. The two marker drops are the deleted blocks above.
• Tests and build: pnpm test:coder steps all pass (TMPDIR under /private/tmp): coder node tests, codex app-server, contracts, server (257 files), providers, source-control, client-runtime, shared, and test:knip. Web passes apart from the two Tests that flake under full-suite load #236 load flakes (localApi, AttachmentFilePreview), which pass alone. pnpm build passes.
• amd64 helper container (node:24-bookworm-slim): it boots, applies migrations through 072 (070 and 071 as no-ops), and extracts document text.
• Live harness (local Coder 2.34.5 server, 2.25.3 CLI, x86_64 workspace):
  • Helper install over coder ssh, and server config with connectionProbe advertised.
  • A project, workspace file search and read, and streamed image, PDF, HTML, notebook and favicon assets.
  • A 1 MiB upload round trip, thread search, and MR filter options.
  • Socket reattach through the same helper, and a real coder port-forward start, restart and close.
  • A fake kilo acp agent turn that finds the bridge, lists tools (no t3_environment_link* tools) and calls t3_queue over it.

🤖 Generated with Claude Code