[Yarden-zamir]

Cause

Fork Sync run 40196119239 stopped on merge conflicts in 12 files. The 6 upstream commits:

• feat(web): Settings and Usage open as large modals over your thread pingdotgg/t3code#24847: Settings and Usage open as large modals over the thread. The Settings routes moved from routes/settings*.tsx to routes/_chat.settings*.tsx.
• feat(server): cut T3's agent instructions and tool copy by 60% pingdotgg/t3code#24850: agent instructions and MCP tool descriptions are 60% shorter.
• fix(release): desktop builds pass again after the vite-plus 1.4 upgrade pingdotgg/t3code#24867: the desktop bundle scan reads the vite-plus 1.4 module comments. This is the same fix as the fork's fix(build): the bundle scan reads the module comments of vite-plus 1.4 #350.
• fix(server): forked threads get titles from the history they inherit pingdotgg/t3code#24857, test(server): restart replay tests no longer hang on a leftover checkpoint capture pingdotgg/t3code#24851, perf(desktop): stop decoding snapshots twice for accessibility pingdotgg/t3code#19221: small fixes.

Conflicts and resolution

36 hunks in 12 files:

• Bundle scan (scripts/lib/cli-external-packages.ts): took upstream's fix(release): desktop builds pass again after the vite-plus 1.4 upgrade pingdotgg/t3code#24867 and its test. The fork copy of the fix (fix(build): the bundle scan reads the module comments of vite-plus 1.4 #350) is gone, so these files equal upstream again.
• Settings routes:
  • The fork routes settings.fork, settings.machines and settings.terminal move to _chat.settings.* with /_chat/settings/... paths, as upstream's routes did. The URLs stay /settings/....
  • routeTree.gen.ts is regenerated. It differs from upstream's only by these three routes.
• _chat.settings.tsx: the fork settings find box stays in upstream's new modal header.
• AppSidebarLayout.tsx: the fork cheat sheet and navigation history recorder stay. Upstream removed ProjectProjectionRetention and gated the undo shortcut on the modal.
• ThreadRouteView.tsx: the fork leaveMissingRoute (navigation history) stays, with upstream's new background guard.
• MCP tools and instructions (environment, orchestrator, project, pull request, thread tools, orchestratorMcp.ts, orchestrationInstructions.ts):
  • Took upstream's short text.
  • In the same style, added back what the fork and the adopted pull requests add: environmentId parameters and sentences for linked environments, clientRequestId for safe launch retries, stop=true on interrupt, scheduled task modelSelection, scripts on project update, and the message link instructions.
  • A thread in a linked environment is named by title, because its link would open here.
  • The instruction sections stay under the Codex 4,000-byte limit (largest section: 1,463 bytes).

Fork fixes

A review of pingdotgg#24847 against the fork features found two breaks:

• Terminal threads: with Settings or Usage open over a terminal thread, its shortcuts still acted on the hidden thread, and they took keys from the Keybindings recorder. The terminal thread screen now stands its shortcuts down in the background, as upstream's chat view does.
• Settings find box: Escape closed the whole Settings modal, because the modal's document listener ran first. The box now handles Escape on its input, as upstream's settings search does. docs/fork/features.md says so.

Both are UI wiring fixes without a new test.

Upstream merge

Merges pingdotgg/t3code main at 3d00499 "perf(desktop): stop decoding snapshots twice for accessibility (pingdotgg#19221)".

Adopted upstream pull requests

All 7 entries (pingdotgg#16653, pingdotgg#16654, pingdotgg#16655, pingdotgg#16684, pingdotgg#16695, pingdotgg#16698, pingdotgg#16719) are unchanged at their listed heads. No new merges.

Upstream changes in fork areas

Checked and fine:

• Settings paths: _chat adds no path segment, so the fork settings nav, settings search, mod+,, the cheat sheet link and the desktop "open settings" path keep working.
• feat(server): cut T3's agent instructions and tool copy by 60% pingdotgg/t3code#24850: no fork test asserts on tool or instruction text, and fork code reads no schema descriptions.
• Cosmetic: under the modal, the fork sidebar tab keys (mod+alt+[ and mod+alt+]) still switch tabs behind it.

Checks

• checks.py: typecheck, migration check, adopted pull request check and lint on all fork files pass.
• fork_tests.py: 172 fork test files pass locally (114 root and 58 web). The apps/server fork test files are left to Fork CI, because they stop the agent session on this VPS.
• Fork repair skill tests: 18 pass.

Fork repair skill changes

• New route_tree.py: it regenerates and stages apps/web/src/routeTree.gen.ts with the router plugin's own generator. This merge needed that step by hand. SKILL.md lists it.