[jayleaton]

Problem

The fork was 166 upstream commits behind pingdotgg/t3code main (last sync 8c3e84a at f054d1b). Upstream has since landed SQLite reader/writer routing, indexed Cmd+K message search, the forge-definitions refactor, PR-watch owed-check and no-checks wakes, and a run of crash, reconnect and mobile fixes the fork wants.

Fix

A normal merge of upstream/main @ 453bf01 into fork main @ 1a43bde, plus follow-up commits for fork-side breakage.

origin/main (1a43bde71a) ──┐
upstream/main (453bf01d20) ┴─ 1636540938  merge (51 conflicted files)
                              └─ 6def538d3f … 47604ddfc8 fork follow-ups

Policy: upstream wins for upstream-owned code. Where both sides changed a file, fork behaviour is ported onto upstream's structure. Where upstream fixed something the fork had also patched, the fork copy is dropped.

Migrations and dependencies

• Upstream 069_ThreadMessageSearch registers as 69 under its own name. The fork ledger (Migrations/fork/001–011) is unchanged. scripts/upstream-migrations.json was regenerated with --sync upstream/main, and KNOWN_RENUMBERED is still empty.
• @clerk/expo-native-components override goes to upstream's 0.4.0, which matches the patch file. check-patch-pins: all 30 patched dependencies pinned.
• pnpm-lock.yaml is upstream's, regenerated by vp i with the fork workspace (+72 lines).

Conflict resolutions (server)

• Orchestrator.ts: keeps the fork's durable settle cascade (dispatchParentLinkRepair, dispatchSubRunSettle, dispatchSettlementFollow, planSettlementCascade, fix(server): settle cascades run as a durable effect with explicit provenance #131) next to upstream's new runInterruptReason. PR helpers now come from sourceControl/threadPullRequests.ts (upstream's forge refactor). The fork's watch helpers stay in @t3tools/shared/threadPullRequests.
• ProjectionStore.ts: upstream now routes reads through the reader connection (readOnReader, fix(server): route SQLite reads around writer contention pingdotgg/t3code#23902). The fork's read methods (getChildThreads, hasActiveDescendants, getThreadParentLinks, getProfileSnapshotContent) are wrapped the same way. putProfileSnapshotContent writes, so it stays on the writer. Inside a write transaction readOnly keeps using the writer, so cascade reads still see uncommitted rows.
• ThreadSettlementService.ts: fork version, with the rules in autoSettlement.ts. Upstream fix(server): settle inactive threads with persisted open PR links pingdotgg/t3code#24617 ("settle inactive threads with persisted open PR links") is already the fork's behaviour, because fork settlement is inactivity-only. Its test is ported to the fork API.
• pullRequestWatch.ts: combines the fork's host-read required checks (RequiredChecks, including expected-but-missing checks) with upstream's owed-checks wake (fix(server): wake PR watches when remaining CI checks finish pingdotgg/t3code#23904) and no-checks notice (fix(server): wake PR watches when no checks report pingdotgg/t3code#23863). evaluatePullRequestWatch takes (watch, detail, remarks, requiredChecks, now).
• ws.ts: takes upstream's RPC handler split (fix(server): preserve typed requirements as the RPC group grows pingdotgg/t3code#23813) in place of the fork's contract-level WsRpcGroupFirstHalf/SecondHalf, which are folded back into one WsRpcGroup. Handlers are typed against ServerWsRpcGroup as upstream does. The fork's unresponsive-client TCP reset is kept. client.connected analytics drop out, per upstream fix(server): analytics stop counting reconnects, retries, and dev servers pingdotgg/t3code#24601.
• MCP: t3_background_wait (upstream) is added to the fork's remote-aware orchestrator handlers. The delegate_task description and the orchestration instructions take upstream fix(server): align delegated review follow-up guidance pingdotgg/t3code#24560: independent review rounds call delegate_task again, and a same-child follow-up uses t3_thread_send on childThreadId. Upstream's "only create top-level threads when asked" line is not taken, because fork children are launched through t3_thread_launch/create_threads. Upstream's agentStopReason sits next to the fork's cause-chain errorMessage.
• GitVcsDriverCore.ts: upstream's t3-merge-base key (with the legacy gh-merge-base read fallback), written through the fork's lock-retrying writeConfigValue.
• storageCleanup.ts: upstream's unified latest-shell recheck, plus the fork's DELETION_PENDING marker.
• ScheduledTaskService, OrchestrationCommandReceipts, migrate-dev-db, SourceControlProviderRegistry, contracts/orchestrationV2.ts and claudeCompaction.ts: both sides' imports or definitions kept. The SourceControlDiscovery test is upstream's rewrite.
• pullRequestWatch.forgejoComments.test.ts: deleted as upstream did (test(source-control): forge behaviour is tested in its own package pingdotgg/t3code#24000 moved forge behaviour tests into the forge packages).

Conflict resolutions (clients)

• Desktop: DesktopLifecycle.test.ts keeps the fork's overrides hook for the supervised-relaunch test, and upstream's stuck-quit test (fix(desktop): a stuck quit no longer leaves the app unkillable pingdotgg/t3code#23873) passes exit through it. The diff of apps/desktop/src against fork main is exactly upstream's changes. Renderer recovery (fix(desktop): a dead main renderer reloads instead of leaving a blank window #123), supervised relaunch (fix(desktop): let a service supervisor own the post-update relaunch #125) and RTTIME/DISABLE_RTKIT (fix(desktop): keep the realtime CPU limit and supervisor across restarts #138) are untouched.
• Web: AppSidebarLayout keeps the hidden sidebar on the Agents board and adds upstream's BackgroundThreadAnnouncer. Sidebar.logic, MessagesTimeline and BrowserImportWizard merge both sides. desktopUpdate.logic.test keeps the jayleaton/t3code default. ChatView.logic and useComposerSend keep the fork side, which still has no compact-before-send (removed in the last sync, ce33581).
• Mobile: HomeRouteScreen keeps the Agents board and BoardTabSwitch, with upstream's Settings-as-tab navigation (feat(mobile): Settings is a workspace tab, and tabs never open on an empty detail pingdotgg/t3code#24524). ThreadComposer, ThreadFeed, ThreadDetailScreen, LinkedPullRequestList, ThreadPullRequestsSheet, threadListV2 and use-thread-outbox-drain: upstream structure with the fork's agent avatar, watch-paused label and subagent filter.
• client-runtime: connection/driver.ts takes upstream's late-answer-first retry order but keeps the fork's route classification (LAN/tailnet without Connect, answered refusal vs. silent timeout). sharedSettings takes upstream's deletion of the unused mismatch helper.

Fork-side follow-ups

• Upstream fix(threads): Working holds only background work the agent waits on pingdotgg/t3code#24610 says only awaited commands and monitors hold a card in Working. Three fork tests used an unawaited monitor as active work: they now mark it awaited: true, or drop monitor from the "always holds" cases.
• The fork's quiet-watch test reads a GitHub PR with no checks, which now (correctly) triggers upstream's no-checks wake. The test sets checksAlwaysReport: false so it measures only quiet time.
• Upstream PR-watch tests got the fork's requiredChecks argument and mocks.
• AgentsRoutes.browser.test mocks useQuietThreadShells, which the announcer now reads.
• The GitVcsDriverCore concurrency test reads the t3-merge-base key.
• A replayed command receipt now carries replayed: true (upstream), so the fork's idempotency test expects it.
• knip: removed isClaudeResumeCompactionQuestion, whose only upstream caller is the web Compact chip the fork doesn't ship.
• Upstream's no-em-dash-copy lint rule (fix: no more em dashes in product copy pingdotgg/t3code#23799) runs on every file. Fork Agents and MCP gateway strings now use colons and parentheses (f16c8d6).
• mcp-gateway bridge.test.ts: the auth helper resolved on a 10 ms timer after sending configure, which lost a race on a loaded CI runner. It now waits for the bridge's configured reply (47604dd). The gateway code itself is unchanged by this merge.
• Merged current fork main (fix(server): legacy fork ledgers with title state at 52 split, and refused databases stop restarting #139, the splitLegacyForkLedger repair) at fbafde9 without conflicts. The split reads upstream ids from the manifest, which now includes 69. check-upstream-migrations still passes and --sync makes no change. ForkMigrations, Migrations, Sqlite, fork migrations, reconcileV2PreviewMigration, serviceLauncher and the desktop backend tests pass (11 files, 107 tests).

Upstream fixes gained (relevant to JJ's issues)

Crashes

• fix(desktop): reduce app crashes when a preview tab's renderer dies during agent screenshots (fix(desktop): reduce app crashes when a preview tab's renderer dies during agent screenshots pingdotgg/t3code#24056)
• fix(desktop): a stuck quit no longer leaves the app unkillable (fix(desktop): a stuck quit no longer leaves the app unkillable pingdotgg/t3code#23873)
• fix(server): agent-browser and Chrome no longer outlive the agent that started them (fix(server): agent-browser and Chrome no longer outlive the agent that started them pingdotgg/t3code#21299)
• fix(provider-acp): force-kill terminal commands that ignore SIGTERM (fix(provider-acp): force-kill terminal commands that ignore SIGTERM pingdotgg/t3code#24596)
• fix(codex): bound pending requests after app-server stdout closes (fix(codex): bound pending requests after app-server stdout closes pingdotgg/t3code#24600)

Reconnects and connectivity

• fix(server): route SQLite reads around writer contention (fix(server): route SQLite reads around writer contention pingdotgg/t3code#23902), retry provider event writes after brief SQLite locks (fix(server): retry provider event writes after brief SQLite locks pingdotgg/t3code#24571), speed up shell snapshots on large databases (fix(server): speed up shell snapshots on large databases pingdotgg/t3code#23751), avoid full shell read on resume (fix(server): avoid full shell read on resume pingdotgg/t3code#23987), long agent turns no longer load whole when a thread opens (fix(server): long agent turns no longer load whole when a thread opens pingdotgg/t3code#24589)
• fix(server): websocket tickets name the route they open (fix(server): websocket tickets name the route they open pingdotgg/t3code#24554); reject pairing with an incompatible server protocol (fix(server): reject pairing with an incompatible server protocol pingdotgg/t3code#23789)
• feat(server): devices on the same network reach background services over LAN (feat(server): devices on the same network reach background services over LAN pingdotgg/t3code#24588)
• fix(web): SSH environments on an older reused remote server explain the version mismatch instead of reconnecting forever (fix(web): SSH environments on an older reused remote server explain the version mismatch instead of reconnecting forever pingdotgg/t3code#23647)
• fix(web): new threads no longer hang when a project's machine is offline (fix(web): new threads no longer hang when a project's machine is offline pingdotgg/t3code#23967)
• fix(server): pause periodic PR discovery without foreground clients (fix(server): pause periodic PR discovery without foreground clients pingdotgg/t3code#23852)

Mobile

• fix(mobile): Back from a sub-agent opened from its delegator returns to the delegator (fix(mobile): Back from a sub-agent opened from its delegator returns to the delegator pingdotgg/t3code#23795), the question card uses the whole screen (fix(mobile): the question card uses the whole screen while the keyboard is closed pingdotgg/t3code#24363), the iPhone new-chat button on iOS 26.6 (fix(mobile): the iPhone new-chat button sits beside the tab bar on iOS 26.6 pingdotgg/t3code#24492), plus about 20 more layout fixes (Duo, Android composer, light mode, toasts)
• perf(mobile): native @pierre/highlights instead of Shiki (perf(mobile): highlight code with native @pierre/highlights instead of Shiki pingdotgg/t3code#24544)
• feat(mobile): Settings and Usage are workspace tabs (feat(mobile): Settings is a workspace tab, and tabs never open on an empty detail pingdotgg/t3code#24524, feat(mobile): add Usage and Settings to workspace navigation pingdotgg/t3code#23841)

Updater and provider updates

• fix(web): provider updates no longer pop toasts on launch (fix(web): provider updates no longer pop toasts on launch pingdotgg/t3code#23233)
• fix(desktop): support Linux distro protocol launchers (fix(desktop): support Linux distro protocol launchers pingdotgg/t3code#24591)
• fix(opencode): retry failed model catalogs until they recover (fix(opencode): retry failed model catalogs until they recover pingdotgg/t3code#23939)
• fix(server): Codex accounts show ChatGPT's current plan names (fix(server): Codex accounts show ChatGPT's current plan names pingdotgg/t3code#24200); keep managed Codex token renewal in the server (fix(server): keep managed Codex token renewal in the server pingdotgg/t3code#21786, fix(server): renew active managed Codex turns through native auth pingdotgg/t3code#21787)

Performance

• perf(server): coalesce superseded streaming text updates (perf(server): coalesce superseded streaming text updates pingdotgg/t3code#24267); skip unused Git output line parsing (perf(server): skip unused Git output line parsing pingdotgg/t3code#23953); faster terminal clipboard sequences (perf(server): speed up large terminal clipboard sequences pingdotgg/t3code#23819)
• perf(client)/perf(web): fewer scans and allocations in streaming timelines (perf(client): avoid full ordering scans for streamed replacements pingdotgg/t3code#24264, perf(web): reduce allocations in streaming timeline scans pingdotgg/t3code#23739, perf(web): reuse a collator when sorting changed-file trees pingdotgg/t3code#23776)
• fix(server): keep subagent transcript updates off the shell stream (fix(server): keep subagent transcript updates off shell stream pingdotgg/t3code#23783); analytics stop flooding with MCP tool calls, reconnects and retries (fix(server): stop flooding analytics with successful MCP tool calls pingdotgg/t3code#24287, fix(server): analytics stop counting reconnects, retries, and dev servers pingdotgg/t3code#24601)

Agents and orchestration

• fix(threads): Working holds only background work the agent waits on (fix(threads): Working holds only background work the agent waits on pingdotgg/t3code#24610), and the new t3_background_wait MCP tool
• fix(server): Stop stops a thread's subagents again (fix(server): Stop stops a thread's subagents again pingdotgg/t3code#23886); resume Codex parents after native children finish (fix(server): resume Codex parents after native children finish pingdotgg/t3code#23840); interrupts started by an agent no longer say "by user" (fix(server): interrupts started by an agent no longer say "by user" in the timeline pingdotgg/t3code#24299)
• fix(server): wake PR watches when no checks report (fix(server): wake PR watches when no checks report pingdotgg/t3code#23863) or when the remaining CI checks finish (fix(server): wake PR watches when remaining CI checks finish pingdotgg/t3code#23904); Forgejo skipped jobs no longer keep a watch pending (fix(server): Forgejo skipped jobs no longer keep a pull request watch pending pingdotgg/t3code#16668)
• feat(search): Cmd+K finds the right thread first, with indexed message search (feat(search): Cmd+K finds the right thread first, with indexed message search pingdotgg/t3code#24343)

Not taken: upstream's compact-before-send and stale-thread Compact chip (pingdotgg#24008, pingdotgg#24334, client side). The fork removed T3-started compaction in its last sync and keeps it removed. The server-side compaction fixes (pingdotgg#24172) are merged.

Evidence

Run locally on this branch:

Check	Result
node scripts/check-upstream-migrations.ts	All 69 upstream migrations keep their ids (0 known exceptions)
node scripts/check-patch-pins.ts	All 30 patched dependencies are pinned
vp run typecheck: t3, contracts, shared, provider-core, web, client-runtime, desktop, mobile	pass
vp lint on every changed .ts/.tsx file	0 errors (warnings only, present on both sides)
vp fmt --check on changed files	clean
vp run check:changed (format, lint, knip, typecheck of 34 packages, tests beside changes)	format, lint, typecheck pass; knip passes after 1e7bbb6. Tests: 406 files, 7597 pass. 4 web browser files (21 tests) timed out under load and all 34 of their tests pass when re-run alone.
vp test run of the fork tests updated for upstream's new rules (runtimeLayer, Orchestrator.parentThread, ThreadSettlementService, GitVcsDriverCore)	pass
vp test run web agents, client-runtime, mcp-gateway (browser + node)	156 files, 1597 tests pass (after the AgentsRoutes mock fix)
Fork release gate parts: fork migrations, Migrations, desktop app, build-desktop-artifact, clients	29 files, 229 pass, 2 skipped
Client-side resolutions (desktop lifecycle, desktopUpdate/ChatView/Sidebar logic, sharedSettings, threadListV2)	275 tests pass

Merge Danger

Door: two-way. The only schema change is upstream's additive migration 69 (message search index). Fork migrations and ids are unchanged, so after a code rollback the previous build starts and only logs a divergence warning for the unknown migration 69 (the search table stays unused).

Blast Radius: platform. Server, web, desktop, mobile and contracts all change. The risk is concentrated in settle cascades, PR watches (now waking on owed and no-checks events) and the RPC group typing.

Upstream base: pingdotgg/t3code@453bf01d20.

Opus 5.5 (claude-opus-5-5) via Claude Code in T3 Code.

🤖 Generated with Claude Code

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	−7 B (−0.1%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	−7 B (−0.6%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	20.9 KiB	20.9 KiB	0 B (0.0%)	29.3 KiB	✅
Codex	Live turn messages	2	2	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.2 KiB	21.2 KiB	0 B (0.0%)	29.3 KiB	✅
Claude	Live turn messages	2	2	0 (0.0%)	8	✅

Baseline: ffa911e · PR result: fbafde9 · 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: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

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