[Yarden-zamir]

Cause

The Fork Sync run 39604718103 stopped on a merge conflict. Upstream added 3 commits. The main one is pingdotgg#22790, "send selected held messages when a thread is stopped". It adds a "Send now" action and a queued-run.start command.

Conflict and how it is resolved

• apps/web/src/components/chat/QueuedRunsControl.tsx, steer tooltip: upstream's new text ("Start a turn with this message" or "Send as a steer instead") replaces the old text. The fork ShortcutHint stays, and it now shows for the first row when canSend is true. The fork removed the steerShortcutLabel prop, so upstream's label suffix is not used.

Upstream changes in fork areas

• QueuedRunsControl.tsx: upstream added a second resume command atom. The fork already has resumeQueue and a local resume handler, so the web typecheck failed. "Send now" now uses resumeQueue.
• Queue resume waits for a usage limit (README fork list): the server refuses queued-run.start on a usage-limited queue, the same as queue.resume. On the web, "Send now" now continues the limited thread first, as "Resume queue" does. On mobile, "Send now" stays disabled under a usage limit. The paused-queue row already explains why. A new browser test covers the web behaviour. The README fork line is updated.
• threadWorkflows.test.ts: upstream's new test fixture had no turnItems. The fork heldByUsageLimit reads them, so the fixture now has turnItems: [].
• apps/server/src/cli/pair.ts (fix(server): t3 pair in a worktree no longer falls back to the live install pingdotgg/t3code#22855): in a linked worktree, t3 pair no longer falls back to the shared home. The fork tunnel pairing URL in resolveDirectPairingBaseUrl is not affected.
• ClaudeAdapterV2.ts (fix(server): delegated Claude children follow your subagent cache TTL setting pingdotgg/t3code#22841), Orchestrator.ts, contracts and client-runtime: these merged without conflicts and did not affect fork code.

Checks

• vp run typecheck: the only failure was the duplicate resume declaration, and it is fixed. Web and mobile typecheck pass after the fix.
• Tests: pair.test.ts, ClaudeAdapterV2.test.ts, keybindings.test.ts, threadWorkflows.test.ts (21) and QueuedRunsControl.browser.test.tsx (2) pass.
• Format and lint of the changed files: 0 errors.
• Fork CI runs lint, the full suites and the build.