[Yarden-zamir]

Cause

Fork Sync run 40262460560 stopped on merge conflicts in 16 files.

• The batch has 61 upstream commits. About 40 of them turn lint and Effect diagnostic rules on or off.
• The rest: terminal sessions keep one driver per mode (refactor(client): terminal sessions keep one driver per mode pingdotgg/t3code#25186), the mobile terminal lifecycle moves into a session store (refactor(mobile): terminal lifecycle runs in a session store, not screen effects pingdotgg/t3code#25071), the mobile thread detail and feed reset by key (refactor(mobile): thread detail and feed reset by key and share one follow owner pingdotgg/t3code#25148), and cloud account transitions move into a shared service (refactor(mobile): cloud account transitions run in the shared account service pingdotgg/t3code#25150). Upstream also refactored the browser panel and preview sessions (refactor(web): browser panel tabs follow preview sessions without ChatView effects pingdotgg/t3code#25006, refactor(web): preview tab sync subscribes to the preview store instead of its own listener sets pingdotgg/t3code#25196, fix(desktop): hidden preview tabs throttle instead of running at full speed pingdotgg/t3code#25184), added previews for more file types, and turned the working section on by default (feat(sidebar): working section is on by default pingdotgg/t3code#25190).
• After the upstream merge, all 7 adopted upstream pull requests had new heads, rebased onto newer upstream.

Conflicts and resolution

18 hunks in 15 files:

• appInit.tsx: the fork theme fonts, plus upstream's new startAgentOpenedPreviews.
• CommandPalette.tsx: the fork guard (find does nothing in a terminal thread), plus upstream's thread key check.
• ThreadNotificationCoordinator.tsx, ServerBrowser.ts: imports from both sides. ServerBrowser.test.ts: both tests.
• StorageSettings.tsx: the fork reclamation summary with upstream's nowMs.
• client-runtime/state/terminal.ts: the fork resumable attachStream, inside upstream's new atoms object.
• projectScriptEditor.tsx: upstream now remounts the form per request and starts each field from request.initial. The fork fields (global, preview overlay, run in background, global shortcut) do the same.
• ProjectSetupScriptRunner.ts: upstream's simpler stripTerminalControl, still exported for the fork terminal provider.
• DesktopBrowserHost.ts: upstream's dropRelay(tab), then the fork presentation replay.
• Mobile:
  • CloudAuthProvider.tsx: took upstream's cloud account service. It attaches once and has no unmount teardown. So the fork mounted-bridge counter, which kept the Android assistant panel from ending the app's session, is no longer needed.
  • ThreadFeed.tsx: upstream's render-time jump to a message, plus the fork message link target and its note.
  • ThreadDetailScreen.tsx, ThreadTerminalRouteScreen.tsx, ConnectionsNewRouteScreen.tsx: the fork imports with upstream's.
• pnpm-lock.yaml: rebuilt with lockfile.py. The added integrity lines equal upstream's. Upstream also dropped 12 packages that fork dependencies still use, so they stay at their old integrity.

Adopted upstream pull requests

Each new head is a rebase onto newer upstream with lint and API fixes. Compared with git range-diff, they bring no new behavior. They are merged with merge commits, and mergedHead follows:

Pull request	New head
pingdotgg#16653 /mcp narrows a client's modes	56f88be
pingdotgg#16654 t3_thread_launch takes clientRequestId	8a5f64e
pingdotgg#16655 link to another environment	25835af
pingdotgg#16684 agents use linked environments through any T3 tool	7c2dfcb
pingdotgg#16695 work a linked environment starts stays within its link	47ede02
pingdotgg#16698 linked environments in Connections	ab3252d
pingdotgg#16719 delegate_task to a linked environment	8674123

• The fork kept its own side where it adapts the adopted code: machine-map links, fork test files, and the tool text from earlier syncs.
• Adopted files that the fork does not change take the new head's version, with its fixes (decodeEffect, asSome, dropped unused parameters, readOnly reads).
• Migration rule: the heads renumber their migrations to 070_PeerLinks and 071_PeerLinkFence. Fork main still registers neither.
• The heads' test additions are left out where the fork keeps the same tests in its own *.fork.test.ts files, or where upstream deleted the test.

Fork fixes

• Fork right panel (useThreadRightPanel.tsx): it still passed three inputs that upstream's useAgentOpenedPreviews dropped. It also repeated two effects that upstream moved into followPreviewSessions. Both are removed, as upstream did in ChatView.

• useRelativeTimeTick was removed upstream: ForkChangelogDialog and LinkedEnvironmentsSettings now use useNowMinute.

• New lint and Effect rules in fork code:

  • succeedSome/succeedNone, orElseSucceed and forEach.
  • Unused imports and variables are gone. DocumentText is provided in the fork test layers that now need it.
  • Array index keys:
    • The machine map process table now has a real key.
    • Lists with no identity keep their index key, with a stated reason: slot layout rows, chart segments, and change lists that never reorder.

• Upstream's new file preview browser test (AttachmentFilePreview.browser.test.tsx, 130 tests):

  • It failed in Fork CI: 7 tests ran past their 15-second limit or the 1-second vi.waitFor default.
  • Upstream runs it on 8-vCPU Blacksmith runners: 96 seconds for this file, 107 seconds for the whole web suite. Fork CI uses the standard 4-vCPU ubuntu-24.04 runner, which took about 6 minutes for the suite.
  • Pure upstream fails the same way on the VPS. The fork does not change the preview code.
  • Fork runs now skip this one file through apps/web/src/forkExcludedUpstreamTests.ts, as the server list already does for its tests. The entry names its reason and when to remove it. docs/fork/operations.md says so.
  • Owner decision: a larger runner for Fork CI's Test Web job would bring these tests back.

Upstream changes in fork areas

83 files changed on both sides. A review of the behavior changes found the right panel fix above. Checked and fine:

• Mobile terminal threads: they still start, attach and redirect with upstream's session store, including pending launches and read-only terminals.
• Mobile message links, read-aloud and outbox: still wired.
• Assistant panel: it keeps the app's cloud session.
• Browser capture: the fork capture sits next to upstream's new hidden-tab painting. Both take counted surface activity.
• Fork settings panels: the fork slots and additions are intact.
• Working section on by default: fork code follows the new default.

Checks

• checks.py: typecheck, migration check, adopted pull request check, format and lint on all fork files pass.
• fork_tests.py: 176 fork test files pass locally (117 root and 59 web).
• Server: the touched server tests pass (80 tests). The other apps/server fork test files are left to Fork CI.

Fork repair skill changes

• lockfile.py accepts a rebuild that keeps packages upstream dropped, when fork dependencies still use them. It names how many stay. Tested in test_scripts.py.
• SKILL.md: compare a new adopted head with git range-diff, and take the head's version of adopted files that the fork does not change.