[Yarden-zamir]

Cause

Fork Sync run 40149330516 stopped on merge conflicts in 15 files. Upstream brought 25 commits. The ones that touch fork areas most: pingdotgg#24524 (on mobile, Settings is a workspace tab: the Settings sheet becomes root Settings pages opened with openSettings), pingdotgg#24588 (devices on the same network reach background services over LAN, privateNetworkOnly), pingdotgg#24610 (Working holds only background work the agent waits on), pingdotgg#24356 (preview navigation timeout), pingdotgg#24571 and pingdotgg#24616.

Conflicts and resolution

• pnpm-lock.yaml: rebuilt with lockfile.py. The integrity changes equal upstream's.
• knip.jsonc: both ignore lists (fork fonts, upstream @t3tools/mobile-highlights-native).
• apps/server/src/serverRuntimeState.ts, apps/server/src/cli/pair.ts: upstream adds privateNetworkOnly. The fork tunnelPairingUrl stays and still comes first in resolveDirectPairingBaseUrl, before the LAN address.
• apps/server/src/mcp/PreviewAutomationBroker.ts: the fork capture stage (forkPreviewCaptureTimeout) is spread first, and upstream's clamp of timeoutMs to the request budget after it.
• apps/server/src/preview/ServerBrowser.test.ts: two new tests in the same place. Both stay.
• apps/server/src/orchestration-v2/Orchestrator.ts: both imports (TurnItemId as a value, the fork thread kind imports).
• ThreadLaunchService.ts: the fork DispatchModeLimit for agent launches stays in the dispatch pipe. Upstream's replay check (messageWasAlreadyAccepted ||= dispatched.replayed) follows it.
• ThreadManagementService.ts: both new error classes (fork ThreadManagementTerminalThreadRefusedError, upstream ThreadManagementBackgroundWaitError).
• apps/mobile/src/App.tsx: a fork launcher shortcut still decides the first screen on a cold start. Otherwise upstream's start URL (launchWorkspaceURL) applies.
• apps/mobile/src/persistence/mobile-preferences.ts: the fork preference fields and upstream's workspaceSelections.
• ConnectionsNewRouteScreen.tsx: both imports (fork client invite, upstream Settings navigation).
• apps/mobile/src/Stack.tsx: took upstream's root Settings pages (SETTINGS_SCREENS). The fork pages SettingsFork, SettingsVoice, SettingsVoiceProject and SettingsSidebarTab are now root Settings pages there, with settings/fork, settings/voice and settings/voice/project links. Upstream moved WORKSPACE_OVERLAY_ROUTES to features/layout/workspace-overlay-routes.ts.
• settings-sheet-targets.ts: upstream deleted it for settings-page-targets.ts. The fork targets moved to ForkSettingsPageTarget in settings-page-targets.ts, apart from SETTINGS_PAGE_TARGETS:
  • Settings does not reopen them as its remembered page, because the Voice project page needs the project that the Voice page chose.
  • Each navigation to a target union stays within the 25 members that TypeScript checks. SettingsRow navigates to a fork target in a call of its own, as in the last sync.

Fork fixes for the new Settings navigation

• "Pair again" (forkPairAgain.ts) opens Add environment with openSettings, as upstream's home screen does.
• The sidebar tab editor (forkSidebarTabs.ts) opens the SettingsSidebarTab root route. From the home list, it opens as a detail of the current tab, as upstream's usage account page does.
• ForkNewTerminalThread is in the overlay route list, because it is a plain card on Android.
• ForkUpdates.ts: a comment now says that a monitor counts as awaited only when the agent marks it (fix(threads): Working holds only background work the agent waits on pingdotgg/t3code#24610).

Upstream merge

Merges pingdotgg/t3code main at 453bf01 "fix(mobile): the iPhone new-chat button sits beside the tab bar on iOS 26.6 (pingdotgg#24492)".

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

51 files changed on both sides. I resolved the 15 conflicts above. A separate review read the upstream diff of the other 36 files against the fork side, and found no break. It checked:

• Mobile fork Settings rows ("Fork settings", "Voice") and the sidebar tab editor: they open on iOS and Android, also with columns. The fork routes start with Settings, so isSettingsRoute and settingsOpenIn treat them as Settings pages.
• Tunnel pairing next to privateNetworkOnly: privateNetworkOnly turns on only for a web server under the background launcher with no explicit host. The fork installer sets T3CODE_HOST=127.0.0.1, and pair.ts prefers the tunnel URL.
• Recover interrupted agents, settlement hold, auto-update idle check (fix(threads): Working holds only background work the agent waits on pingdotgg/t3code#24610, fix(provider-acp): Grok monitors show as monitors in background work pingdotgg/t3code#24609):
  • Recover interrupted agents still wakes every finished turn with open background work.
  • The settlement hold and the auto-update idle check read kind === "command". Grok monitors are now monitor, and they did not hold these before either, by design.
• Message links (fix(server): long agent turns no longer load whole when a thread opens pingdotgg/t3code#24589): the server still widens a history page so that it reaches the requested message.

Checks

• checks.py: typecheck, migration check and adopted pull request check pass.
• vp fmt --check on the resolved files: clean.
• fork_tests.py: 171 fork test files pass locally (113 root and 58 web, run with --from-chunk after the 10-minute limit). Four fork server tests next to the conflicts pass (16 tests): ThreadManagementService.fork, ThreadLaunchService.fork, PreviewAutomationBroker.fork and pair.fork. The other apps/server fork test files are left to Fork CI, because they stop the agent session on this VPS.
• No test covers the new mobile Settings routes of the fork pages. They are navigation config, and mobile has no navigation test harness for it.

Fork repair skill changes

None. --from-chunk from #342 finished the runs that hit the 10-minute limit.