[Yarden-zamir]

🤖 Repairs the failed Fork Sync (run 41660165779, #451 "Fork sync: upstream merge failed").

Upstream range: ab8e488e10...cefb544af3 (136 commits, up to "feat(web): celebrate a GitHub star with confetti (pingdotgg#29987)").

Conflicts (26 files)

• pnpm-workspace.yaml: kept the fork @kitshn/local pin, took alchemy beta.85 and @alchemy.run/test.
• pnpm-lock.yaml: rebuilt with lockfile.py. @anthropic-ai/claude-agent-sdk stays at upstream's 0.3.284. The drizzle dev peers resolve one patch newer than upstream: @effect/sql-d1 4.1.2 and @cloudflare/workers-types 5.20261102.1.
• packages/contracts/src/previewAutomation.ts: the timeout error has both the fork captureStage and the upstream reason.
• packages/client-runtime/src/state/threadShell.ts: kept the fork terminalThreadStatesAtom and added the upstream hiddenThreadTagsAtom.
• apps/web/src/state/threads.ts, apps/mobile/src/state/threads.ts: pass both atoms.
• apps/server/src/mcp/McpHttpServer.ts: kept the fork toolkit registry imports and added the upstream requestUrl.
• apps/server/src/mcp/PreviewAutomationBroker.ts: kept the fork capture stage and added the upstream server-browser reason.
• apps/server/src/mcp/WorktreeMcpService.ts, toolkits/project/handlers.ts, orchestration-v2/PullRequestWatchReactor.ts: took the Effect 4.1.2 SecureRandom/Digest and kept the fork FileSystem, project-settings imports and settings service.
• apps/server/src/vcs/GitVcsDriverCore.ts: kept the fork worktree path template and deferred branch creation under the lease. Took upstream's Digest and its cleanup of the branch after a failed worktree add.
• apps/server/src/orchestration-v2/runtimeLayer.test.ts: took upstream's table test for unreadable watches and the NodeCrypto layers. Kept the fork ServerSettings.layerTest() and withSharedProjectReads.
• apps/server/src/provider/AgentContextBudget.test.ts: fork mocks plus NodeCrypto.layer.
• apps/web/src/cloud/managedRelayLayer.ts: kept the fork shared DPoP key loader in dpop.ts and took SecureRandom.
• apps/web/src/components/ChatView.tsx: wrapped the timeline in upstream's WorkspaceMutationIdContext and kept the fork forkMessageLink.
• apps/web/src/components/Sidebar.tsx: kept the fork card layout imports. Upstream removed SIDEBAR_TREE_PROPS in fix(web): screen readers can browse and Tab through the threads sidebar again without going into focus mode pingdotgg/t3code#26690, so the import is gone.
• apps/web/src/components/ThreadNotificationCoordinator.tsx: TrackNotification carries threadId for upstream's hidden-tag closing. The fork replacedByTag and addThreadToast stay. addThreadToast now chains the caller's onRemove.
• apps/web/src/components/ThreadRouteView.tsx: took upstream's tag-filter redirects and kept the fork terminal-thread screen. A hidden thread redirects before the terminal-thread branch.
• apps/web/src/components/ThreadTerminalDrawer.tsx: took upstream's toolbar strip (terminalActions), which replaces the fork pt-8 padding. Added the fork tooltips, shortcuts and "Move to a terminal thread" button there.
• apps/web/src/components/chat/DraftHeroHeadline.tsx: upstream's activeProjectTitle, with the fork !terminalMode.
• apps/web/src/components/chat/ThreadRelationshipsControl.tsx, settings/ProjectSettingsPanel.tsx: kept both sides' imports.
• apps/web/src/components/chat/TimelineAssistantRows.tsx: took upstream's revert of the hover timestamp (revert(web): undo hover timestamp change from #28610 pingdotgg/t3code#29680) and kept the fork standalone copy-link.
• apps/mobile/src/features/threads/ThreadDetailScreen.tsx: wrapped the feed in upstream's WorkspaceMutationIdProvider and kept the fork message-link props.
• apps/mobile/src/features/threads/ThreadFeed.tsx: took upstream's DisclosureRow. It gets an optional className for the fork message-link highlight.

Follow-up fixes

• Fork server code moves to the Effect 4.1.2 crypto modules: ForkWorktreeRecreate, forkWorktreeSetup, KitshnSettingsSync, usageSourceAdd.
• ws.ts: the fork label-snapshot call uses upstream's renamed deferNetworkDiscovery.
• Fork tests follow upstream's changes: NodeCrypto.layer next to NodeServices.layer, layerInProcessMcpServer, layerMcpTransport(registrations), hiddenThreadTagsAtom, Word command args, and the new withLateConfigDiscovery argument.
• Upstream's new DesktopApp.test.ts provides the fork DesktopAppToggle and DesktopBrowserHost.

Tests

• checks.py: typecheck, migrations, adopted pull requests, format, lint and knip all pass.
• fork_tests.py: 290 files. Three upstream tests fail only on macOS and the fork does not change them, so Fork CI on Linux runs them. Two DesktopLinuxUrlHandler theme icon tests fail on the case-insensitive file system. GitVcsDriverCore "keeps generated worktree folders short" fails on /var vs /private/var. MessagesTimeline "keeps the worked-for heading in place" failed once under load and passed on the next 2 runs.