[Yarden-zamir]

Fork Sync failed on merge conflicts: https://github.com/Yarden-zamir/t3code/actions/runs/39943621573. Issue: #286.

Conflicts

• apps/server/src/mcp/toolkits/orchestrator/tools.test.ts: upstream test: delete low-value tests and dead test-only exports pingdotgg/t3code#24058 deletes this file. Its fork test (t3_thread_update action fields, from adopted pull request feat(server): agents use linked environments through any T3 tool pingdotgg/t3code#16684) moved to tools.fork.test.ts in test(fork): move fork tests out of upstream test files #296, so the file is deleted, as upstream has it.
• apps/server/src/mcp/OrchestratorMcpService.ts: upstream fix(server): Stop stops a thread's subagents again pingdotgg/t3code#23886 passes stopDelegatedTasks: false when a delegated task stops its child thread. Kept the fork childThreadId variable and added that field.
• apps/desktop/src/preview/DesktopBrowserHost.ts: upstream fix(desktop): reduce app crashes when a preview tab's renderer dies during agent screenshots pingdotgg/t3code#24056 clears tab.relay on detach. Kept the fork forkCapture.detach(key) line next to it.
• apps/web/src/components/chat/MessagesTimeline.tsx: upstream fix(web): screen readers hear when the open thread starts, needs you or finishes pingdotgg/t3code#23752 wraps the timeline in a fragment with a screen reader announcer and re-indents it. Took the fork timeline (message links, timeline cursor) and applied the same wrap.
• apps/web/src/components/sidebar/SidebarThreadRow.tsx: same upstream change: the open thread's row no longer announces its status, because the thread announces it. In the fork, that label renders through ThreadCardStatusBadge (thread card layouts), so the badge gets an announce prop, off for the open thread.

Adopted upstream pull requests

All 7 (pingdotgg#16653 to pingdotgg#16719) are unchanged at their listed heads. Migration check: 68 migrations, all in upstream main. Adopted list check: passes.

Upstream changes in fork areas

• ScheduledTaskService.interval.test.ts (restored by test(server): restore DST scheduling tests deleted in the test snap pingdotgg/t3code#23991): the fork scheduled task service reads server settings, so commit a395e90 adds ServerSettings.layerTest() to its test layer.

• sharedSettings.ts: upstream removes the unused mismatch helpers. The fork threadCardLayouts key stays in the shared settings list.

• keybindings.ts, AppSidebarLayout.tsx: Mod+B bolds only selected text in the rich-text composer and toggles the sidebar otherwise. The fork keybindings are unaffected.

• ThreadManagementService.ts, Orchestrator.ts, orchestrationV2.ts: Stop stops subagents again, with an opt-out that delegated task stops use.

• GitManager.ts: user actions skip the background rate-limit pause. No fork behaviour depends on it.

• New lint rule t3code/no-polling-loop-in-tests (test(lint): new polling loops in tests now fail lint pingdotgg/t3code#23983): three polling loops in apps/server/src/peer/RemoteDelegation.test.ts failed Lint. They come from adopted pull request feat(server): delegate_task to a linked environment pingdotgg/t3code#16719, which the fork keeps as it is, so commit 9da5e00 keeps the rule at warn for that file in a separate fork entry of vite.config.ts, and names it in the forkRules of feat(server): delegate_task to a linked environment pingdotgg/t3code#16719.

The branch also merges origin/main (#296, #312), because main moved during the repair.

Checks

• checks.py of the fork-repair skill: typecheck (35 of 35), migration check and adopted pull request check pass.
• Fork tests on the VPS: 98 files outside apps/server and apps/web, 42 apps/web files and 28 of 82 apps/server files pass. The other 54 server files did not run here: a test run in that range killed the agent session twice (the live T3 service did not restart). Fork CI runs all of them.

[coderabbitai]

✨ Finishing Touches: 💡 1

🛠️ Fix failing CI checks: 💡

• Commit to this branch
• Create a new PR

📝 Generate docstrings

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

_{Comment @coderabbitai help to get the list of available commands.}