[Yarden-zamir]

Cause

Fork Sync run 40187496826 stopped on merge conflicts in 9 files. The 12 upstream commits include pingdotgg#24723 "cold connects skip older settled threads" (63 files): the shell now sends only the 25 newest settled threads, and clients load older ones in pages. Others: pingdotgg#24775 (worktree setup waits for the shell line editor), pingdotgg#24813, pingdotgg#24830, pingdotgg#24809 (request_secret file delivery), pingdotgg#24808, pingdotgg#24836 and five small fixes.

Conflicts and resolution

10 hunks in 9 files:

• ProjectSetupScriptRunner.ts: the error operations keep the fork readThread (the link check) and drop writeCommand, which fix(server): worktree setup no longer hangs when a shell startup prompt eats the command pingdotgg/t3code#24775 removed and no code uses.
• orchestrationInstructions.ts: the fork linked-environment line and the fork thread link additions stay. Took upstream's new request_secret line.
• Web Sidebar.tsx: the fork draftProjectKeys and upstream's scoped threadSearch, both kept.
• V2LifecycleRow.tsx: upstream moved the subagent status to the right. The adopted "on " label stays next to the title.
• Composer mentions (web useComposerMenuItems.ts, mobile use-composer-command-menu.ts): both sides kept. Upstream's search for older settled threads now searches every machine that the agent reads (fork MM-1907), not only this one, so older threads of other machines can be mentioned too.
• Mobile ThreadArrangementSheet.tsx: the fork snooze rule with upstream's settled sort. useThreadListV2.ts: both imports.
• pnpm-lock.yaml: rebuilt with lockfile.py. The integrity changes equal upstream's.

Fork fixes

A review of pingdotgg#24723 against the fork features found three breaks. All come from clients that no longer hold every thread:

• Sidebar tabs lost drags (web and mobile). Every tab edit pruned the assignments of threads that the client did not hold. Older settled threads lost their tab for good, on every machine. Now the prune drops only entries for a tab that cannot hold threads. Limit: entries of deleted threads stay. The comment names when to revisit. Tested in sidebarTabs.logic.test.ts.
• Settled count (web). With a fork tab or the owner filter on, "Settled N" and "Show N more" stayed too high, and pages loaded until none were left. The older-thread scope now follows the owner filter, and the count subtracts every held row in scope. Inside a tab, the count is still too high until all pages load, as on mobile.
• Terminal threads (fork feature). A settled terminal thread can still run a program. Once it fell past the cut, its program notices stopped. The shell now keeps older settled terminal threads; they still count. Tested in ShellStream.fork.test.ts.
• ProjectSetupScriptRunner.test.ts (new upstream tests): the harness stubs the projection store that the fork link check reads.

Upstream merge

Merges pingdotgg/t3code main at e57c093 "perf(shell): cold connects skip older settled threads, 93% of the shell JSON (pingdotgg#24723)".

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

46 files changed on both sides. Apart from the fixes above:

• Server fork paths (machine host, updates, portal views, MCP thread list and read for peers) read the full shell snapshot without the new option. No effect.
• Inbox returns, tab counts, owner filter hidden counts: they read threads that are not settled, which the shell still sends. No effect.
• fix(server): delegated children no longer see pull request watch tools pingdotgg/t3code#24808 hides pull request watch tools from subagents only. Remote delegated children are top-level threads, so they keep the tools as before.
• feat(server): request_secret can save a CLI token to a private file pingdotgg/t3code#24809, fix(server): publish committed events before writer cancellation pingdotgg/t3code#24836: no fork wrapper; the fork EventSink change is in another block. No effect.
• Thread link chips for an older settled thread show the link label instead of the live title, as upstream's own links do.

Checks

• checks.py: typecheck, migration check, adopted pull request check and lint on all fork files pass.
• fork_tests.py: 172 fork test files pass locally (114 root and 58 web).
• Server: ShellStream.test.ts, ShellStream.fork.test.ts and ProjectSetupScriptRunner.test.ts pass (24 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.