merge upstream/main into fork (orchestrator v2 and all fork features ported)

[adampeterhiggins]

Brings the fork up to date with upstream, including upstream's new orchestrator (pingdotgg#2829). That rewrite replaced apps/server/src/orchestration, the old provider adapters, ProviderService and the v1 orchestration contracts with orchestration-v2. Before this PR the fork was 194 commits ahead and 165 behind. With this PR the fork contains all of upstream/main (as of 1a3f7ad508) and all of main, including #143–#151.

This PR started as the base merge, and the stacked feature PRs below are now merged into it. Every fork feature is kept: where upstream gained its own version, the fork's extra behaviour is rebuilt on top of upstream's, and the rest is ported onto v2.

Folded-in PRs

• feat: chat tabs on orchestration v2 #152 Chat tabs on v2: native thread.fork into a tab, shared settlement, handoff, and the account picker's New tab
• feat: transcript export, conversation import picker, and subagent worktree setup on v2 #153 Transcript export, the import-conversation picker, Claude subagent worktree setup, and workspace-relative paths on mobile
• feat(server): Devin and Custom ACP providers on orchestration v2 #154 Devin and Custom ACP as dedicated v2 drivers on upstream's shared ACP adapter
• feat(server): agent access MCP and thread-control extras on orchestration v2 #155 Agent access MCP (/mcp/query and /mcp/operate), a token-only approval tool, spawn limits, and the Started-by chip
• feat: branch naming, message-less threads, and repository context on v2 launches #156 The branch named before setup and the first turn (worktreeBranchPrefix migrated into branchNamePrefix), threads created before their first message, and repository context cloning
• feat: pull request watch extras and per-instance Cursor usage on v2 #157 PR-watch extras on upstream's watch (pause/resume, status line, fix-it prompts, follow-up budget, changes requested, settled threads), per-instance Cursor usage limits, and the "Open pull requests in" setting re-pointed
• feat(web): preview chat tool calls on hover on the v2 timeline #158 Tool-call hover preview (feat(web): preview chat tool calls on hover #143) on the v2 timeline
• feat: usage-limit recovery extras on upstream's recovery worker #159 Usage-limit extras on upstream's recovery worker: Resume now, Continue in new tab, the 60-second grace, and timeline notices
• feat(web): Agents drilldowns on upstream's child-thread subagents #160 Agents drilldowns on upstream's child-thread subagents: search, filter and sort, latest tool call, usage, an agent tab, and attach/continue
• fix(server): Cursor out-of-usage stops show as usage limits #161 A Cursor account running out of usage shows as a usage limit, with the recovery banner, instead of the generic "Provider turn failed."
• feat(web): bring back the Agents sidebar panel alongside Lineage #162 The Agents sidebar panel is back next to upstream's Lineage, sharing one list, filter and sort
• feat(web): inspect a running agent in the sidebar #163 A running agent can be inspected inside the sidebar: drill in, live transcript and tools views, nested agents, Stop, agent tabs, and diffs in hover cards
• fix(web): restore the Agents sidebar behaviours lost in the v2 sync #165 Restores the remaining Agents sidebar behaviours lost in the sync (audit items 1–15):
  • paths relative to the agent's own checkout, and a Details button on conversation rows
  • opening the agent at a clicked tool call, the compact model/effort/run label, and the full usage footer
  • record-only details, timestamps, waiting and running markers, the prompt clamp, and "Showing N of M"
  • provider-aware empty states, tool errors in previews, and stable spawn order
  • Runs and Attempt in usage, and artifacts (output file and remote session link)

Dropped for good

• Cursor CLI sign-in and its shadow HOME. Upstream's Cursor uses @cursor/sdk with a separate sign-in for each instance, so more than one Cursor login still works. Existing Cursor instances need one fresh sign-in.
• Cursor ACP subagents. Upstream's Cursor emits child threads.
• The enableAgentThreadControl toggle. We follow upstream here.
• The fork's migration 55. It collided with upstream's 55 OrchestrationV2. forgetForkMigration55() repairs the ledger before migrating.

The attention inbox shortcut moved to mod+alt+shift+n, because upstream now uses mod+alt+n for a thread without a project.

Verification

• tsc --noEmit passes for contracts, shared, client-runtime, server, web, mobile and desktop on the combined branch.
• vp test run passes on every test file the stack touched: 943 server and package tests, 279 web and 81 mobile. After fix(server): Cursor out-of-usage stops show as usage limits #161–fix(web): restore the Agents sidebar behaviours lost in the v2 sync #165 the server, package and web suites were re-run and all pass (173 server and package tests, 1,084 web).
  • The exception is 2 of upstream's Antigravity file-system tests. They fail on macOS only, because /var is a symlink to /private/var, and pass on Linux CI.
• vp lint reports 0 errors on all changed files.
• I ran the web client against a read-only snapshot of a real v1 fork database: 385 threads, 3.3 GB.
  • The v1→v2 cutover and the migration-55 repair ran cleanly (55_OrchestrationV2, 56_…), and all 385 thread shells were imported.
  • Pins, chat-tab groups, linked PRs and back/forward render correctly. Threads open, and their v1 transcripts import lazily.
  • Providers show Codex, Claude, Devin and Grok authenticated, with the fork's sign-in methods. Linear, Slack, Notion and custom Open-in apps are under Integrations. The Usage page shows Codex limits.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Done by Claude Opus 5.5 in Claude Code (via T3 Code).

🤖 Generated with Claude Code