chore(v2): merge main into the V2 branch

[juliusmarminge]

V2 is 12 commits behind main. This merges origin/main at 1905846 into t3code/codex-turn-mapping at f3eb99e as one merge commit that resolves the conflicts and does nothing else. #10154, which landed on main during the push, is not included.

It brings in #14375, #10963, #14351, #14462 (vite-plus 1.0), #14479, #14480, #14485, #14486, #14490, #13612 (threads without a project), #14497 and #14499. There are no new migrations.

#14521, which moves "threads without a project" into a ScratchWorkspace service, is stacked on this one, and both merge together. This branch also merges V2's f48d257 (#14502), with no conflicts.

V1 files V2 deleted (kept deleted)

• provider/Layers/ClaudeAdapter(.test).ts, fix(server): Claude /compact no longer ends early and leaves the thread busy #14497: a /compact queued behind a Claude-initiated turn should get its own result instead of ending early. V2 covers part of this.

  • Covered: ClaudeAdapterV2.ts:5913 drops the zero-turn task-notification result that fix(server): Claude /compact no longer ends early and leaves the thread busy #14497's test sends, so the /compact run gets its compaction and its own terminal.

  • Covered: ClaudeAdapterV2.ts:6178 sends a positive-turn task-notification wake to a continuation run once the process has echoed early.

  • Follow-up, not ported:

    1. A positive-turn task-notification wake that arrives before the process's first early echo, for example right after a resume, is accepted as the prompt's result (:6161, then :5945). /compact then ends before its compact_boundary.
    2. V2 checks only origin.kind === "task-notification" (:2289). fix(server): Claude /compact no longer ends early and leaves the thread busy #14497 treats every non-human origin (peer, channel, coordinator and so on) as another turn's result, and V2 lets those end the /compact turn.

    Both are being fixed in ClaudeAdapterV2 in a separate PR against V2.

• server.test.ts: feat: start threads without a project #13612's tests for the V1 WebSocket dispatch path. The stacked PR adds service tests instead.

Content conflicts

• relay/AgentAwarenessRelay.test.ts: V2's tests, using chore: bump vite-plus to 1.0 #14462's describe(name, { concurrent: false }, …) in place of describe.sequential.
• apps/web/src/performance.bench.ts, packages/client-runtime/src/remotePerformance.bench.ts: V2's benchmarks, written in chore: bump vite-plus to 1.0 #14462's test(name, ({ bench }) => bench(…).run(options)) form.
• KeybindingsSettings.logic.test.ts: V2's Usage order, with usage.open first and checked against both binding orders. Main's compareCommands and chat.newWithoutProject merged cleanly.
• contracts/rpc.ts: both V2's projects.mutate and feat: start threads without a project #13612's projects.ensureScratch, in main's contract shape.
• ws.ts: V2's side everywhere, and feat: start threads without a project #13612's V1 dispatch helpers are not brought back. projects.ensureScratch is a stub that fails with "Threads without a project are not available yet." The config answer omits scratchWorkspaceRoot, so web and mobile hide the feature. The stacked PR implements both.

Verification

• vp i: the lockfile and the package.json files match main's vite-plus 1.0 bump, and nothing else changed.
• tsc --noEmit, exit 0 with no error TS or warning TS, for apps/server, apps/web, apps/mobile, packages/contracts, packages/client-runtime and packages/shared.
• Server tests, inside unshare -U -p: AgentAwarenessRelay.test.ts (22 passed); OrchestratorReplayFixtures.integration.test.ts, ClaudeReplayFixtures.integration.test.ts and ws.test.ts (109 passed).
• KeybindingsSettings.logic.test.ts (21 passed), contracts/rpc.test.ts (5 passed), vscodeThemeImport.test.ts (18 passed).
• Both bench files, with vp test bench --run: web 6 passed, client-runtime 5 passed.
• fix(server): Claude /compact no longer ends early and leaves the thread busy #14497 coverage: a throwaway probe, since removed, replayed fix(server): Claude /compact no longer ends early and leaves the thread busy #14497's frame order through ClaudeAdapterV2 with zero- and positive-turn task-notification wakes and a peer wake, with and without an early echo.
• vp lint on the conflicted files: no errors. The three warnings in ws.ts (unused Fiber, Schedule and projectSetupScriptRunner) are already on V2. vp fmt --check is clean, and vp run knip:check is clean.
• Not run: the full test suites.

Model: Claude Opus 5.5 (Claude Code)

🤖 Generated with Claude Code

---

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	—	4.9 KiB	—	6.8 KiB	✅
Codex	Thread snapshot wire	—	3.7 KiB	—	4.9 KiB	✅
Codex	Live turn WebSocket wire	—	1.1 KiB	—	2.0 KiB	✅
Codex	Live turn WebSocket decoded	—	20.4 KiB	—	29.3 KiB	✅
Codex	Live turn messages	—	1	—	8	✅
Claude	Total thread wire	—	4.9 KiB	—	6.8 KiB	✅
Claude	Thread snapshot wire	—	3.7 KiB	—	4.9 KiB	✅
Claude	Live turn WebSocket wire	—	1.2 KiB	—	2.0 KiB	✅
Claude	Live turn WebSocket decoded	—	20.8 KiB	—	29.3 KiB	✅
Claude	Live turn messages	—	2	—	8	✅

Baseline: unavailable · PR result: 6b1d22f · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 106.1 KiB
• Claude decoded thread snapshot: 106.4 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This 55-file branch sync includes a substantial threads-without-project capability, a new default shortcut, authentication/RPC changes, and a major toolchain upgrade rather than only mechanical merge resolution. Its broad runtime and sensitive-path impact requires human review.

No code changes detected at 6b1d22f. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}