[Yarden-zamir]

Cause

Fork Sync run 40465302914 stopped on merge conflicts in 6 files. The batch has 18 upstream commits, up to 96fc7b9 "refactor(web): the new design is the only design, with no toggle (pingdotgg#25778)".

Conflicts and resolution

The new design is the only design (pingdotgg#25778)

Upstream removed the redesign: Tailwind variant and the redesignEnabled setting. A redesign: class left in fork code would now do nothing, so the fork row would fall back to the old look. Upstream's class changes are applied to the fork code:

• SidebarThreadRow.tsx: the fork keeps its card structure (shared card parts and the custom card layout).
  • Each X redesign:Y class pair becomes Y, as upstream did.
  • The one-line shelf row no longer shows a PR badge.
  • The woke alarm icon always shows.
  • An empty meta line hides.
• threadCardParts.tsx:
  • The active card drops its light shadow.
  • The project label is always font-normal, so its recede prop is gone (ThreadCardLayoutPreview.tsx follows).
  • The branch label has no muted color.

No redesign uses remain in app code.

Other conflicts

• ChatView.tsx: refactor(web): drop the unreachable paint-only thread timeline path pingdotgg/t3code#25787 removed the paint-only timeline path. The fork forkMessageLink stays without its paint-only condition.
• McpHttpServer.ts: test(server): CI fails when agent context grows past main pingdotgg/t3code#25785 exports layerTools for the new agent context test. It now merges the fork's typed toolkitRegistrations, which includes the machine map tools.
• Mobile Stack.tsx: upstream's imports with the fork AppServicesHost and ReadAloudWorker.
• Mobile AppearancePreferencesProvider.tsx: upstream reads the system palettes from an atom and resolves the theme variables with resolveThemeVariablesByAppearance. A useMemo keeps the fork paletteVersion dependency, so a theme that a server republishes under the same id still repaints with the React compiler. The fork published theme style and variables stay.
• Mobile useAppShortcuts.ts: refactor(mobile): notifications, quick actions and Connect onboarding navigate through the root ref pingdotgg/t3code#25769 deletes it. installAppShortcuts now queues the launch shortcut until navigation is ready, so Back returns home.
  • The fork fixed the same cold start (5fd6235, "the Android New task shortcut opens the draft when it starts the app") through getInitialURL.
  • Both together would open the shortcut twice, so the fork code goes and upstream's runs.
  • The behavior in docs/fork/features.md ("The New task launcher shortcut on Android opens the same draft, also when the app was closed") stays the same.

Fork fixes

• Agent context budget (test(server): CI fails when agent context grows past main pingdotgg/t3code#25785): AgentContextBudget.test.ts asserts that the measured agent context equals agentContextBudget.json.
  • The test mocks the fork services that the fork tools need: MachineExec, MachineMap, MachinePeers, PeerForwarding and RemoteDelegation.
  • The JSON holds the fork's measured values, so Fork CI passes.
  • Compared with upstream, the fork adds 550 bytes to the Claude system append and to the Codex context. It adds 21,500 bytes (+51%) to the MCP tool list, from the machine map tools and the linked environment parameters. That growth may be worth a look.
• docs/fork/features.md: one more stale "Server settings > New threads" becomes "Threads".

Upstream merge

Merges pingdotgg/t3code main at 96fc7b9.

Adopted upstream pull requests

All 7 entries are unchanged at their listed heads.

Upstream changes in fork areas

36 files changed on both sides. Besides the conflicts above:

• Compact tool schemas (fix(server): all MCP tools now send compact schemas, cutting tool context by 23% pingdotgg/t3code#25790): every MCP tool now sends a compact schema. That includes the fork machine map toolkit, which registers through the same toolkitRegistration.
• Delegated acknowledgements and Claude MCP timeouts (fix(server): preserve settled runs during delegated acknowledgements pingdotgg/t3code#25672, fix(server): Claude MCP timeouts preserve the native session pingdotgg/t3code#25660): server changes in EventSink, Orchestrator and ProviderTurnStartService merge cleanly next to the fork worktree resume. The server fork tests run in Fork CI.
• Mobile app services, share inbox and theme runtime: they merge cleanly next to the fork published themes and app services host.

Checks

• checks.py: typecheck, migration check, adopted pull request check, format, lint and knip pass.
• fork_tests.py: 185 fork test files pass locally (121 root and 64 web). The apps/server fork test files are left to Fork CI.
• AgentContextBudget.test.ts passes with the fork values.

Fork repair skill changes

• SKILL.md: says that agentContextBudget.json holds the fork's measured values, and how to update them when upstream or fork tool text changes.