[Yarden-zamir]

Cause

Fork Sync run 40156995667 stopped on merge conflicts in 47 files. Most come from upstream pingdotgg#21514 "halve code comments and cap comment blocks at four lines". It rewrites comments in 1782 files, so many of them conflict next to fork code. It also makes t3code/no-low-value-comments fail on comment blocks over 4 lines, bare issue numbers and @public boilerplate, which 124 comments in fork-changed files broke. The batch has 14 upstream commits, among them pingdotgg#24104 (share a thread with a guest), pingdotgg#23178 (web code highlight with @pierre/highlights), pingdotgg#24643 and pingdotgg#24647 (dedupe IDs and bodies on the wire), pingdotgg#24648 (cold connects skip idle subagent threads) and pingdotgg#24602 (mobile PR management).

Conflicts and resolution

59 hunks in 47 files:

• 36 hunks where upstream changed only comments.
  • 26 merged line by line: the fork code with upstream's shorter comment.
  • The other 10: the fork code is kept, and the comment upstream rewrote is swapped in where the fork still has it.
• 23 hunks with upstream code changes. Resolved by hand, so that upstream's new code holds each fork change:
  • Guest sharing:
    • Web: the fork menu items and guards stay next to upstream's "Share with guest". This covers threadActionMenu.logic.ts, useThreadActionMenu.ts, ChatHeader.tsx, Sidebar.tsx and CommandPalette.tsx.
    • Web: routes/__root.tsx keeps the fork machine-paused and client-pending screens after upstream's guest path.
    • Mobile: ThreadFeed.tsx gives the fork message link hook the transcript, and the list gets the transcript plus upstream's guest rows.
  • Contracts: clientRpcPermissions.ts and orchestrationV2.ts keep both sides' entries.
  • Mobile HomeScreen.tsx: took upstream's new useThreadListV2 hook. The fork sidebar tab filter now goes through a new optional filterListThreads input. It narrows only the listed threads, so move menus and inbox returns still see every thread, as before.
  • Web:
    • settingsSearch.ts and SettingsSidebarNav.tsx: the fork settings paths and labels stay next to upstream's Beta page.
    • Sidebar.logic.ts: the fork terminal-thread statuses stay before upstream's guest Request status.
    • MessagesTimeline.tsx, ChatView.tsx and state/threads.ts: imports and props from both sides.
• pnpm-lock.yaml: rebuilt with lockfile.py. The integrity changes equal upstream's.

Fork fixes

• Comment cap (124 errors):
  • 114 fork comments are shortened to their constraint. Only comment lines change, and typecheck passes.
  • 10 comments come from adopted pull requests (feat(server): agents use linked environments through any T3 tool pingdotgg/t3code#16684, feat(server): work a linked environment starts stays within its link pingdotgg/t3code#16695, feat(server): delegate_task to a linked environment pingdotgg/t3code#16719). The fork keeps adopted heads as they are, so vite.config.ts sets the rule to warn for those 6 files: linkOrigin.ts, threadAccess.ts, ThreadLaunchService.ts, PeerForwarding.ts, RemoteDelegation.ts and orchestrationV2.ts. The forkRules of those entries name the override. Remove a file when its head or upstream main shortens the comments.
• Guest Request status: upstream adds a request status. The fork thread card badge (an icon slot), the sidebar tab status map and the terminal thread row status now know it.
• Emergency pause (MM-718) also closes guest links:
  • Upstream's guest links use their own session, outside environment auth, so the pause did not reach them.
  • A paused machine now treats guest sharing as off. Guest requests are refused, an open guest stream ends at its next access check, and the guest gets back in after Resume.
  • Tested in GuestShareService.fork.test.ts. The "Emergency pause" section of docs/fork/features.md says so.

Upstream merge

Merges pingdotgg/t3code main at 8045537 "perf(orchestration): thread snapshots send each long ID once (pingdotgg#24643)".

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

293 files changed on both sides, 83 of them with upstream code changes. Two subagents resolved the web and mobile conflicts, and three shortened comments. A separate review read the upstream code changes of the other 59 files against the fork side. It found the guest pause gap above, and no other effect:

• Dedupe markers (perf(orchestration): thread snapshots send each long ID once pingdotgg/t3code#24643, perf(server): thread opens and live events send each message body once pingdotgg/t3code#24647): opt-in. Only client-runtime/state/threads.ts opts in and restores them. Fork code reads restored projections, and peer forwarding goes through MCP, not the stream.
• Cold connects (perf(shell): cold connects skip idle subagent threads, a third of the thread list pingdotgg/t3code#24648): remote delegated tasks are top-level threads, and pending-request children stay in the shell.
• RPC scopes: guestShareCreate needs access:write, which machine grants never carry.

Checks

• checks.py: typecheck (36 of 36 packages), migration check and adopted pull request check pass.
• vp lint on all 1072 fork-changed TypeScript files: no errors.
• fork_tests.py: 171 fork test files pass locally (113 root and 58 web, finished with --from-chunk).
• Fork server tests pass locally:
  • Near the conflicts: McpToolAccess.fork, OrchestratorMcpService.fork, ThreadLaunchService.fork, http.fork (38 tests).
  • Guest service: GuestShareService.test.ts and the new GuestShareService.fork.test.ts (21 tests).
• The other apps/server fork test files are left to Fork CI, because they stop the agent session on this VPS.

Fork repair skill changes

None. The line-level merge of comment-only hunks used throwaway scripts, because a repo-wide comment rewrite is a one-off. Add them to the skill if a second one comes.