[Yarden-zamir]

Cause

Fork Sync run 40430754579 stopped on merge conflicts in 9 files. The batch has 13 upstream commits, up to becf853 "fix(web): PDF search finds phrases that wrap across lines (pingdotgg#25702)". The conflicts come from 4 of them:

• feat(web): thread state lives at the end of the timeline, not stacked on the composer pingdotgg/t3code#25401: thread state moves from the composer to the end of the timeline. The queue becomes an "Up next" list there.
• refactor(web): drafts promote from the draft store, not from route effects pingdotgg/t3code#25615: drafts promote from the draft store, and ThreadRouteView follows a redirect that the store leaves behind.
• fix(mobile): queued messages are delivered by an app service, not a render loop pingdotgg/t3code#25678: mobile queued messages are delivered by an app service, not a render loop.
• refactor(mobile): settings use web's pages and groups pingdotgg/t3code#25686: mobile settings use the web pages and groups.

pingdotgg#24635 also adds an evals package that imports taskPrompt from OrchestratorMcpService.ts.

Conflicts and resolution

Web

• ThreadRouteView.tsx: upstream file, with the fork changes applied again:
  • A terminal thread renders ForkTerminalThreadScreen, and never ChatView. This also holds for a promoted draft on its way to a terminal thread.
  • useSettleNavigationTraverse stays.
  • Back and forward history: upstream now renders <Navigate to="/"> for a missing draft. The fork needs leaveMissingRoute, so that back and forward skip a missing entry. A small effect runs leaveMissingRoute around the same redirect. The missing server thread redirect also goes through leaveMissingRoute, as before.
• QueuedRunsControl.tsx: upstream's new "Up next" list, with the fork behaviour applied again:
  • The "Queue paused" row with "Resume queue", under the list heading.
  • Resume after a usage limit (onResumeLimitedThread), and no resume during a queued message edit.
  • ShortcutHint in the edit and steer tooltips. The fork keeps no shortcut label props.
• ThreadActivityBanners.tsx: upstream's ThreadNowItem and new dot colors. The fork background work details (BackgroundWorkIcon, BackgroundWorkText) still wrap the icon and title.
• appInit.tsx: the fork navigation history import next to upstream's subscribeDraftThreadPromotion.
• ChatComposer.tsx: upstream dropped the ReactNode import. The fork forkLeadingControl prop needs it, so it is back.

Server

• OrchestratorMcpService.ts: the adopted pull request feat(server): delegate_task to a linked environment pingdotgg/t3code#16719 keeps taskPrompt in delegatedTaskModes.ts. Upstream exports it from OrchestratorMcpService.ts for the evals, so that file re-exports it.

Mobile

• App.tsx, Stack.tsx, AssistantPanel.tsx: upstream starts the outbox delivery and attachment uploads as module services in App.tsx. index.ts imports App.tsx for both the app and the Android assistant panel, so the services run once per JS runtime. thread-outbox-worker.tsx wrapped the deleted hooks, so it becomes app-services-host.tsx. That file only keeps the singleton host for the relay sign-in (CloudAuthProvider), which the panel mounts on a cold start until the app root mounts. ReadAloudWorker stays.
• SettingsServerControlsRouteScreen.tsx, ThreadSettingsSections.tsx: upstream merges New threads and Thread behavior into one Threads page. ForkMobileNewThreadsServerSection follows "Default permissions", and ForkMobileThreadsSection follows auto-settle there. Thread behavior became Labs, without fork rows.

Upstream merge

Merges pingdotgg/t3code main at becf853.

Adopted upstream pull requests

• feat(server): delegate_task to a linked environment pingdotgg/t3code#16719 "feat(server): delegate_task to a linked environment": its head moves from 8674123 to 6b9cfd5. The range diff shows one changed commit, which only regroups the test layers in PeerForwarding.test.ts. The rebase made git conflict in RemoteDelegation.ts and Sidebar.tsx. Fork main already holds the old head there, so fork main's side stays.
• Two parts of feat(server): delegate_task to a linked environment pingdotgg/t3code#16719 come back: the earlier adoption merge (db36732) kept the fork side for ProjectionStore.test.ts and a contract comment in orchestrationV2.ts. This merge brings in the pull request's own versions: the "record reads select subagents by id" test (fork main has the subagentIds filter it tests) and the shorter remote stop comment.
• List: the mergedHead of feat(server): delegate_task to a linked environment pingdotgg/t3code#16719 is now 6b9cfd5, in the same merge commit. The other 6 entries are unchanged.

Upstream changes in fork areas

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

• Composer (feat(web): thread state lives at the end of the timeline, not stacked on the composer pingdotgg/t3code#25401): the tasks badge, activity row and queue attachment leave the composer. The fork Terminal mode toggle, citations without a note anchor and alternate send hint do not use them.
• System banners: banners get a group, and the version mismatch banner moves to the sidebar pill. The fork quiet reconnect delay still sets the reconnect grace.
• Mobile threads and new task flow: the pending-task editor and the inspector sync effects are removed. The fork terminal thread and card layout code merges cleanly.

Docs

• docs/fork/features.md: the mobile "Thread behavior" and "Server settings > New threads" are now "Threads".
• Fork comments: two fork comments use the new names.
• Adopted list: the reason line in scripts/fork-adopted-upstream-prs.json names Settings > Environments.

Checks

• checks.py: typecheck, migration check, adopted pull request check, format, lint and knip pass.
• fork_tests.py: 181 fork test files pass locally (119 root and 62 web). The apps/server fork test files are left to Fork CI.
• SettingsServerControlsRouteScreen.test.tsx and both QueuedRunsControl browser tests pass.

Fork repair skill changes

None.